Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

i2c: mux: pca9541: 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>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent bb853aac

drivers/i2c/muxes/i2c-mux-pca9541.c

+3 −3
Original line number Diff line number Diff line
@@ -345,11 +345,11 @@ static int pca9541_probe(struct i2c_client *client, 


	/*

	 * I2C accesses are unprotected here.

	 * We have to lock the adapter before releasing the bus.

	 * We have to lock the I2C segment before releasing the bus.

	 */

	i2c_lock_adapter(adap);

	i2c_lock_bus(adap, I2C_LOCK_SEGMENT);

	pca9541_release_bus(client);

	i2c_unlock_adapter(adap);

	i2c_unlock_bus(adap, I2C_LOCK_SEGMENT);



	/* Create mux adapter */