summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2014-10-16 04:57:21 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-10-24 09:30:14 -0200
commit470a9147899500eb4898f77816520c4b4aa1a698 (patch)
tree16b77be089b11afb418932654233bb92d8243835 /drivers/media/usb
parenta4789e6fc299e5437b55c878269b3d10f7707093 (diff)
downloadblackbird-op-linux-470a9147899500eb4898f77816520c4b4aa1a698.tar.gz
blackbird-op-linux-470a9147899500eb4898f77816520c4b4aa1a698.zip
[media] usbvision-video: two use after frees
The lock has been freed in usbvision_release() so there is no need to call mutex_unlock() here. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb')
-rw-r--r--drivers/media/usb/usbvision/usbvision-video.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c
index 68bc9615660e..9bfa041e3316 100644
--- a/drivers/media/usb/usbvision/usbvision-video.c
+++ b/drivers/media/usb/usbvision/usbvision-video.c
@@ -446,6 +446,7 @@ static int usbvision_v4l2_close(struct file *file)
if (usbvision->remove_pending) {
printk(KERN_INFO "%s: Final disconnect\n", __func__);
usbvision_release(usbvision);
+ return 0;
}
mutex_unlock(&usbvision->v4l2_lock);
@@ -1221,6 +1222,7 @@ static int usbvision_radio_close(struct file *file)
if (usbvision->remove_pending) {
printk(KERN_INFO "%s: Final disconnect\n", __func__);
usbvision_release(usbvision);
+ return err_code;
}
mutex_unlock(&usbvision->v4l2_lock);
OpenPOWER on IntegriCloud