summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cpia2/cpia2.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-12-18 09:50:43 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-01-19 11:28:12 -0200
commitd2db8fee0d77f43f64e4e97ccc1558a9f59fab41 (patch)
tree4c4a65bb628b94ce7df210cef85b7fa218f9b592 /drivers/media/video/cpia2/cpia2.h
parent9af39713feb53da96ba23fa94a73ffd0de50a815 (diff)
downloadlinux-d2db8fee0d77f43f64e4e97ccc1558a9f59fab41.tar.bz2
[media] cpia2: convert .ioctl to .unlocked_ioctl
Implement core-assisted locking in cpia2. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cpia2/cpia2.h')
-rw-r--r--drivers/media/video/cpia2/cpia2.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cpia2/cpia2.h b/drivers/media/video/cpia2/cpia2.h
index 916c13d5cf7d..6d6d1843791c 100644
--- a/drivers/media/video/cpia2/cpia2.h
+++ b/drivers/media/video/cpia2/cpia2.h
@@ -378,7 +378,7 @@ struct cpia2_fh {
struct camera_data {
/* locks */
- struct mutex busy_lock; /* guard against SMP multithreading */
+ struct mutex v4l2_lock; /* serialize file operations */
struct v4l2_prio_state prio;
/* camera status */