summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/uvc/uvcvideo.h
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2010-10-02 09:04:53 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 01:18:26 -0200
commit27a61c13ec5d9c1da5286fd1697ab5930b916b4f (patch)
treefc2853c64f1558c94d1665c9c1537d2823e43c43 /drivers/media/video/uvc/uvcvideo.h
parentb5977a58c330ac6afdc64bab9b1dd674f11c0635 (diff)
downloadlinux-27a61c13ec5d9c1da5286fd1697ab5930b916b4f.tar.gz
linux-27a61c13ec5d9c1da5286fd1697ab5930b916b4f.tar.bz2
linux-27a61c13ec5d9c1da5286fd1697ab5930b916b4f.zip
[media] uvcvideo: Fix uvc_query_v4l2_ctrl() and uvc_xu_ctrl_query() locking
Take the ctrl_mutex mutex before touching control information in those functions. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc/uvcvideo.h')
-rw-r--r--drivers/media/video/uvc/uvcvideo.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index 7d67d95de838..d97cf6d6a4f9 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -413,7 +413,7 @@ struct uvc_video_chain {
struct uvc_entity *processing; /* Processing unit */
struct uvc_entity *selector; /* Selector unit */
- struct mutex ctrl_mutex;
+ struct mutex ctrl_mutex; /* Protects ctrl.info */
};
struct uvc_streaming {