summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/pwc/pwc.h
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2013-04-01 23:04:21 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-05-07 14:35:07 +0200
commitcd5de26288604cb8a6f7fba041cc5fb610cbff9e (patch)
tree18a8c635b3499e341c6b5e7d1f46dc94088332d9 /drivers/media/usb/pwc/pwc.h
parentMerge branch 'devel-for-v3.10' into v4l_for_linus (diff)
downloadlinux-cd5de26288604cb8a6f7fba041cc5fb610cbff9e.tar.xz
linux-cd5de26288604cb8a6f7fba041cc5fb610cbff9e.zip
[media] pwc: Fix comment wrt lock ordering
With all the changes to handle the locking in the v4l2-core rather then at the driver level, the order in which the 2 pwc locks need to be taken has changed, update the comment in the header file to correctly reflect this. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/pwc/pwc.h')
-rw-r--r--drivers/media/usb/pwc/pwc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/pwc/pwc.h b/drivers/media/usb/pwc/pwc.h
index 7a6a0d39c2c6..81b017a554bc 100644
--- a/drivers/media/usb/pwc/pwc.h
+++ b/drivers/media/usb/pwc/pwc.h
@@ -226,7 +226,7 @@ struct pwc_device
struct list_head queued_bufs;
spinlock_t queued_bufs_lock; /* Protects queued_bufs */
- /* Note if taking both locks v4l2_lock must always be locked first! */
+ /* If taking both locks vb_queue_lock must always be locked first! */
struct mutex v4l2_lock; /* Protects everything else */
struct mutex vb_queue_lock; /* Protects vb_queue and capt_file */