lkml.org 
[lkml]   [2016]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 007/346] [media] em28xx-i2c: rt_mutex_trylock() returns zero on failure
    3.16.39-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit e44c153b30c9a0580fc2b5a93f3c6d593def2278 upstream.

    The code is checking for negative returns but it should be checking for
    zero.

    Fixes: aab3125c43d8 ('[media] em28xx: add support for registering multiple i2c buses')

    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/media/usb/em28xx/em28xx-i2c.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    --- a/drivers/media/usb/em28xx/em28xx-i2c.c
    +++ b/drivers/media/usb/em28xx/em28xx-i2c.c
    @@ -501,9 +501,8 @@ static int em28xx_i2c_xfer(struct i2c_ad
    int addr, rc, i;
    u8 reg;

    - rc = rt_mutex_trylock(&dev->i2c_bus_lock);
    - if (rc < 0)
    - return rc;
    + if (!rt_mutex_trylock(&dev->i2c_bus_lock))
    + return -EAGAIN;

    /* Switch I2C bus if needed */
    if (bus != dev->cur_i2c_bus &&
    \
     
     \ /
      Last update: 2016-11-14 04:45    [W:4.045 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site