diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-05-09 05:22:55 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-07 15:23:44 +0200 |
| commit | 5d6700e3d62450658de92ee8f6da850bd78854e8 (patch) | |
| tree | 845437546afc54f1f0ea07c0147ddffaba612693 | |
| parent | c5f519610b9636e6abee78c54e85ecb46dcc9b49 (diff) | |
| download | lwn-5d6700e3d62450658de92ee8f6da850bd78854e8.tar.gz lwn-5d6700e3d62450658de92ee8f6da850bd78854e8.zip | |
em28xx-i2c: rt_mutex_trylock() returns zero on failure
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-i2c.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c index a19b5c8b56ff..1a9e1e556706 100644 --- a/drivers/media/usb/em28xx/em28xx-i2c.c +++ b/drivers/media/usb/em28xx/em28xx-i2c.c @@ -507,9 +507,8 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap, if (dev->disconnected) return -ENODEV; - 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 && |