Commit c060a9fe authored by Peter Rosin's avatar Peter Rosin Committed by Wolfram Sang
Browse files

media: drxk_hard: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) 



Locking the root adapter for __i2c_transfer will deadlock if the
device sits behind a mux-locked I2C mux. Switch to the finer-grained
i2c_lock_bus with the I2C_LOCK_SEGMENT flag. If the device does not
sit behind a mux-locked mux, the two locking variants are equivalent.

Signed-off-by: default avatarPeter Rosin <peda@axentia.se>
Acked-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent b1e1ca27

drivers/media/dvb-frontends/drxk_hard.c

+2 −2
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static inline u32 log10times100(u32 value) 


static int drxk_i2c_lock(struct drxk_state *state)

{

	i2c_lock_adapter(state->i2c);

	i2c_lock_bus(state->i2c, I2C_LOCK_SEGMENT);

	state->drxk_i2c_exclusive_lock = true;



	return 0;
@@ -224,7 +224,7 @@ static void drxk_i2c_unlock(struct drxk_state *state) 
	if (!state->drxk_i2c_exclusive_lock)

		return;



	i2c_unlock_adapter(state->i2c);

	i2c_unlock_bus(state->i2c, I2C_LOCK_SEGMENT);

	state->drxk_i2c_exclusive_lock = false;

}