Patch "[media] em28xx-i2c: rt_mutex_trylock() returns zero on failure" has been added to the 4.4-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2016-10-05 13:11:04
This is a note to let you know that I've just added the patch titled
[media] em28xx-i2c: rt_mutex_trylock() returns zero on failure
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
em28xx-i2c-rt_mutex_trylock-returns-zero-on-failure.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From e44c153b30c9a0580fc2b5a93f3c6d593def2278 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <redacted>
Date: Mon, 9 May 2016 05:22:55 -0300
Subject: [media] em28xx-i2c: rt_mutex_trylock() returns zero on failure
From: Dan Carpenter <redacted>
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 <redacted>
Signed-off-by: Mauro Carvalho Chehab <redacted>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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@@ -507,9 +507,8 @@ static int em28xx_i2c_xfer(struct i2c_ad 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 &&
Patches currently in stable-queue which might be from dan.carpenter@oracle.com are queue-4.4/fnic-pci_dma_mapping_error-doesn-t-return-an-error-code.patch queue-4.4/dmaengine-at_xdmac-fix-debug-string.patch queue-4.4/mmc-pxamci-fix-potential-oops.patch queue-4.4/avr32-off-by-one-in-at32_init_pio.patch queue-4.4/tools-vm-slabinfo-fix-an-unintentional-printf.patch queue-4.4/em28xx-i2c-rt_mutex_trylock-returns-zero-on-failure.patch queue-4.4/usb-gadget-fsl_qe_udc-signedness-bug-in-qe_get_frame.patch