summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzequiel Garcia <elezegarcia@gmail.com>2012-07-15 03:00:33 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-13 17:42:14 -0300
commit0ab61196e5b6d73ef5bb058a323d3ac7309cdc62 (patch)
treef0248ca29a112b73a0239d3990e1d73a018c4f85
parent1f71927ed51e9125eb7a3d4aed54f68dd41f2c34 (diff)
downloadlinux-0ab61196e5b6d73ef5bb058a323d3ac7309cdc62.tar.gz
linux-0ab61196e5b6d73ef5bb058a323d3ac7309cdc62.tar.bz2
linux-0ab61196e5b6d73ef5bb058a323d3ac7309cdc62.zip
[media] pwc: Use vb2 queue mutex through a single name
This lock was being taken using two different names (pointers) in the same function. Both names refer to the same lock, so this wasn't an error; but it looked very strange. Cc: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/usb/pwc/pwc-if.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
index de7c7ba99ef4..b5d0729c28d3 100644
--- a/drivers/media/usb/pwc/pwc-if.c
+++ b/drivers/media/usb/pwc/pwc-if.c
@@ -1127,7 +1127,7 @@ static void usb_pwc_disconnect(struct usb_interface *intf)
v4l2_device_disconnect(&pdev->v4l2_dev);
video_unregister_device(&pdev->vdev);
mutex_unlock(&pdev->v4l2_lock);
- mutex_unlock(pdev->vb_queue.lock);
+ mutex_unlock(&pdev->vb_queue_lock);
#ifdef CONFIG_USB_PWC_INPUT_EVDEV
if (pdev->button_dev)