| Message ID | 1342332033-30250-1-git-send-email-elezegarcia@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, Thanks for the patch, I've added it to my tree for 3.7: http://git.linuxtv.org/hgoede/gspca.git/shortlog/refs/heads/media-for_v3.7-wip Regards, Hans On 07/15/2012 08:00 AM, Ezequiel Garcia wrote: > 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> > --- > drivers/media/video/pwc/pwc-if.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c > index de7c7ba..b5d0729 100644 > --- a/drivers/media/video/pwc/pwc-if.c > +++ b/drivers/media/video/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) > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index de7c7ba..b5d0729 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/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)
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> --- drivers/media/video/pwc/pwc-if.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)