diff options
| author | Wolfram Sang | 2018-07-13 00:12:53 +0200 |
|---|---|---|
| committer | Wolfram Sang | 2018-07-13 00:12:53 +0200 |
| commit | fb2896a77989314ea89d89c3bdfee93002a760c9 (patch) | |
| tree | 19df2cde875a69bcfe50296a2c9ae204ffdba0c1 /drivers/i2c/muxes | |
| parent | i2c: i801: Add support for Intel Ice Lake (diff) | |
| parent | i2c: remove i2c_lock_adapter and use i2c_lock_bus directly (diff) | |
| download | kernel-qcow2-linux-fb2896a77989314ea89d89c3bdfee93002a760c9.tar.gz kernel-qcow2-linux-fb2896a77989314ea89d89c3bdfee93002a760c9.tar.xz kernel-qcow2-linux-fb2896a77989314ea89d89c3bdfee93002a760c9.zip | |
Merge branch 'i2c/precise-locking-names_immutable' into i2c/for-4.19
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 3d8c938e99e7..9e75d6b9140b 100644 --- a/drivers/i2c/muxes/i2c-mux-pca9541.c +++ b/drivers/i2c/muxes/i2c-mux-pca9541.c @@ -298,11 +298,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 */ |