diff options
| author | Peter Rosin <peda@axentia.se> | 2018-06-20 07:17:55 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2018-07-13 00:08:14 +0200 |
| commit | f06c97dd50870c3ccdea0726617a729bb83f5d30 (patch) | |
| tree | 8011d5b61e9c65f872819de79c8d9afe19c7a6bc /drivers/i2c/muxes | |
| parent | bb853aac2c478ce78116128263801189408ad2a8 (diff) | |
| download | linux-f06c97dd50870c3ccdea0726617a729bb83f5d30.tar.gz linux-f06c97dd50870c3ccdea0726617a729bb83f5d30.tar.bz2 linux-f06c97dd50870c3ccdea0726617a729bb83f5d30.zip | |
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>
Diffstat (limited to 'drivers/i2c/muxes')
| -rw-r--r-- | drivers/i2c/muxes/i2c-mux-pca9541.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c index 6a39adaf433f..bc7c8cee5a8c 100644 --- a/drivers/i2c/muxes/i2c-mux-pca9541.c +++ b/drivers/i2c/muxes/i2c-mux-pca9541.c @@ -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 */ |