lkml.org 
[lkml]   [2018]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/11] media: af9013: switch to i2c_lock_segment
    Date
    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/media/dvb-frontends/af9013.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/media/dvb-frontends/af9013.c b/drivers/media/dvb-frontends/af9013.c
    index 482bce49819a..a504697ff557 100644
    --- a/drivers/media/dvb-frontends/af9013.c
    +++ b/drivers/media/dvb-frontends/af9013.c
    @@ -1312,10 +1312,10 @@ static int af9013_wregs(struct i2c_client *client, u8 cmd, u16 reg,
    memcpy(&buf[3], val, len);

    if (lock)
    - i2c_lock_adapter(client->adapter);
    + i2c_lock_segment(client->adapter);
    ret = __i2c_transfer(client->adapter, msg, 1);
    if (lock)
    - i2c_unlock_adapter(client->adapter);
    + i2c_unlock_segment(client->adapter);
    if (ret < 0) {
    goto err;
    } else if (ret != 1) {
    @@ -1353,10 +1353,10 @@ static int af9013_rregs(struct i2c_client *client, u8 cmd, u16 reg,
    buf[2] = cmd;

    if (lock)
    - i2c_lock_adapter(client->adapter);
    + i2c_lock_segment(client->adapter);
    ret = __i2c_transfer(client->adapter, msg, 2);
    if (lock)
    - i2c_unlock_adapter(client->adapter);
    + i2c_unlock_segment(client->adapter);
    if (ret < 0) {
    goto err;
    } else if (ret != 2) {
    --
    2.11.0
    \
     
     \ /
      Last update: 2018-06-15 12:19    [W:2.637 / U:0.620 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site