aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-05-09 04:22:55 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-06-10 07:29:40 -0400
commite44c153b30c9a0580fc2b5a93f3c6d593def2278 (patch)
tree14d26e4daea500ed68ff19e754d4facaede626e7
parent917d11a4e0c8c9e3d375a7baa945fe0da6b15f88 (diff)
[media] em28xx-i2c: rt_mutex_trylock() returns zero on failure
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>
-rw-r--r--drivers/media/usb/em28xx/em28xx-i2c.c5
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,
507 if (dev->disconnected) 507 if (dev->disconnected)
508 return -ENODEV; 508 return -ENODEV;
509 509
510 rc = rt_mutex_trylock(&dev->i2c_bus_lock); 510 if (!rt_mutex_trylock(&dev->i2c_bus_lock))
511 if (rc < 0) 511 return -EAGAIN;
512 return rc;
513 512
514 /* Switch I2C bus if needed */ 513 /* Switch I2C bus if needed */
515 if (bus != dev->cur_i2c_bus && 514 if (bus != dev->cur_i2c_bus &&