diff options
Diffstat (limited to 'drivers/media/video/cpia.h')
-rw-r--r-- | drivers/media/video/cpia.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/cpia.h b/drivers/media/video/cpia.h index f629b693ee65..de6678200a57 100644 --- a/drivers/media/video/cpia.h +++ b/drivers/media/video/cpia.h | |||
@@ -47,6 +47,7 @@ | |||
47 | #include <linux/videodev.h> | 47 | #include <linux/videodev.h> |
48 | #include <linux/list.h> | 48 | #include <linux/list.h> |
49 | #include <linux/smp_lock.h> | 49 | #include <linux/smp_lock.h> |
50 | #include <linux/mutex.h> | ||
50 | 51 | ||
51 | struct cpia_camera_ops | 52 | struct cpia_camera_ops |
52 | { | 53 | { |
@@ -246,7 +247,7 @@ enum v4l_camstates { | |||
246 | struct cam_data { | 247 | struct cam_data { |
247 | struct list_head cam_data_list; | 248 | struct list_head cam_data_list; |
248 | 249 | ||
249 | struct semaphore busy_lock; /* guard against SMP multithreading */ | 250 | struct mutex busy_lock; /* guard against SMP multithreading */ |
250 | struct cpia_camera_ops *ops; /* lowlevel driver operations */ | 251 | struct cpia_camera_ops *ops; /* lowlevel driver operations */ |
251 | void *lowlevel_data; /* private data for lowlevel driver */ | 252 | void *lowlevel_data; /* private data for lowlevel driver */ |
252 | u8 *raw_image; /* buffer for raw image data */ | 253 | u8 *raw_image; /* buffer for raw image data */ |
@@ -261,7 +262,7 @@ struct cam_data { | |||
261 | u8 mainsFreq; /* for flicker control */ | 262 | u8 mainsFreq; /* for flicker control */ |
262 | 263 | ||
263 | /* proc interface */ | 264 | /* proc interface */ |
264 | struct semaphore param_lock; /* params lock for this camera */ | 265 | struct mutex param_lock; /* params lock for this camera */ |
265 | struct cam_params params; /* camera settings */ | 266 | struct cam_params params; /* camera settings */ |
266 | struct proc_dir_entry *proc_entry; /* /proc/cpia/videoX */ | 267 | struct proc_dir_entry *proc_entry; /* /proc/cpia/videoX */ |
267 | 268 | ||