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

media: af9013: 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 193c2a07

drivers/media/dvb-frontends/af9013.c

+4 −4
Original line number Diff line number Diff line
@@ -1312,10 +1312,10 @@ static int af9013_wregs(struct i2c_client *client, u8 cmd, u16 reg, 
	memcpy(&buf[3], val, len);



	if (lock)

		i2c_lock_adapter(client->adapter);

		i2c_lock_bus(client->adapter, I2C_LOCK_SEGMENT);

	ret = __i2c_transfer(client->adapter, msg, 1);

	if (lock)

		i2c_unlock_adapter(client->adapter);

		i2c_unlock_bus(client->adapter, I2C_LOCK_SEGMENT);

	if (ret < 0) {

		goto err;

	} else if (ret != 1) {
@@ -1353,10 +1353,10 @@ static int af9013_rregs(struct i2c_client *client, u8 cmd, u16 reg, 
	buf[2] = cmd;



	if (lock)

		i2c_lock_adapter(client->adapter);

		i2c_lock_bus(client->adapter, I2C_LOCK_SEGMENT);

	ret = __i2c_transfer(client->adapter, msg, 2);

	if (lock)

		i2c_unlock_adapter(client->adapter);

		i2c_unlock_bus(client->adapter, I2C_LOCK_SEGMENT);

	if (ret < 0) {

		goto err;

	} else if (ret != 2) {