| Message ID | 20180615101506.8012-5-peda@axentia.se (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jun 15, 2018 at 12:14:59PM +0200, Peter Rosin wrote: > 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_segment. 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> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> I'm OK with it going through Wolfram's tree; I do not think I'd need an immutable branch for this even... > --- > drivers/input/touchscreen/rohm_bu21023.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/touchscreen/rohm_bu21023.c b/drivers/input/touchscreen/rohm_bu21023.c > index bda0500c9b57..22d79db07234 100644 > --- a/drivers/input/touchscreen/rohm_bu21023.c > +++ b/drivers/input/touchscreen/rohm_bu21023.c > @@ -304,7 +304,7 @@ static int rohm_i2c_burst_read(struct i2c_client *client, u8 start, void *buf, > msg[1].len = len; > msg[1].buf = buf; > > - i2c_lock_adapter(adap); > + i2c_lock_segment(adap); > > for (i = 0; i < 2; i++) { > if (__i2c_transfer(adap, &msg[i], 1) < 0) { > @@ -313,7 +313,7 @@ static int rohm_i2c_burst_read(struct i2c_client *client, u8 start, void *buf, > } > } > > - i2c_unlock_adapter(adap); > + i2c_unlock_segment(adap); > > return ret; > } > -- > 2.11.0 > Thanks.
diff --git a/drivers/input/touchscreen/rohm_bu21023.c b/drivers/input/touchscreen/rohm_bu21023.c index bda0500c9b57..22d79db07234 100644 --- a/drivers/input/touchscreen/rohm_bu21023.c +++ b/drivers/input/touchscreen/rohm_bu21023.c @@ -304,7 +304,7 @@ static int rohm_i2c_burst_read(struct i2c_client *client, u8 start, void *buf, msg[1].len = len; msg[1].buf = buf; - i2c_lock_adapter(adap); + i2c_lock_segment(adap); for (i = 0; i < 2; i++) { if (__i2c_transfer(adap, &msg[i], 1) < 0) { @@ -313,7 +313,7 @@ static int rohm_i2c_burst_read(struct i2c_client *client, u8 start, void *buf, } } - i2c_unlock_adapter(adap); + i2c_unlock_segment(adap); return ret; }
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_segment. 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> --- drivers/input/touchscreen/rohm_bu21023.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)