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: Peter Rosin <peda@axentia.se>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Peter Rosin 2018-06-20 07:17:55 +02:00 committed by Wolfram Sang
parent bb853aac2c
commit f06c97dd50

View File

@ -345,11 +345,11 @@ static int pca9541_probe(struct i2c_client *client,
/* /*
* I2C accesses are unprotected here. * 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); pca9541_release_bus(client);
i2c_unlock_adapter(adap); i2c_unlock_bus(adap, I2C_LOCK_SEGMENT);
/* Create mux adapter */ /* Create mux adapter */