From 907a6df9a1d87e977a3eef5105ce0fb17d2e8b60 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Sun, 15 Jul 2012 03:00:33 -0300 Subject: [PATCH] --- yaml --- r: 330955 b: refs/heads/master c: 0ab61196e5b6d73ef5bb058a323d3ac7309cdc62 h: refs/heads/master i: 330953: dfdd62e80f35e78193a7df027204c0eca6b8ab05 330951: f271fb0bed8602611311facfa2f6e3dd4a113585 v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/pwc/pwc-if.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 72fcbe85de9e..2f7019eb18d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f71927ed51e9125eb7a3d4aed54f68dd41f2c34 +refs/heads/master: 0ab61196e5b6d73ef5bb058a323d3ac7309cdc62 diff --git a/trunk/drivers/media/usb/pwc/pwc-if.c b/trunk/drivers/media/usb/pwc/pwc-if.c index de7c7ba99ef4..b5d0729c28d3 100644 --- a/trunk/drivers/media/usb/pwc/pwc-if.c +++ b/trunk/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)