diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-12-18 07:50:43 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-01-19 08:28:12 -0500 |
commit | d2db8fee0d77f43f64e4e97ccc1558a9f59fab41 (patch) | |
tree | 4c4a65bb628b94ce7df210cef85b7fa218f9b592 /drivers/media/video/cpia2/cpia2.h | |
parent | 9af39713feb53da96ba23fa94a73ffd0de50a815 (diff) |
[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.h | 2 |
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 { | |||
378 | 378 | ||
379 | struct camera_data { | 379 | struct camera_data { |
380 | /* locks */ | 380 | /* locks */ |
381 | struct mutex busy_lock; /* guard against SMP multithreading */ | 381 | struct mutex v4l2_lock; /* serialize file operations */ |
382 | struct v4l2_prio_state prio; | 382 | struct v4l2_prio_state prio; |
383 | 383 | ||
384 | /* camera status */ | 384 | /* camera status */ |