diff options
| author | Ingo Molnar <mingo@elte.hu> | 2006-02-07 08:49:14 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-07 08:49:14 (GMT) |
| commit | 3593cab5d62c4c7abced1076710f9bc2d8847433 (patch) | |
| tree | dd5dc21961f6b4aef6900b0c2eb63ce7c70aecd5 /drivers/media/video/cpia.h | |
| parent | 538f9630afbbe429ecbcdcf92536200293a8e4b3 (diff) | |
| download | linux-fsl-qoriq-3593cab5d62c4c7abced1076710f9bc2d8847433.tar.xz | |
V4L/DVB (3318b): sem2mutex: drivers/media/, #2
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
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 f629b69..de66782 100644 --- a/drivers/media/video/cpia.h +++ b/drivers/media/video/cpia.h @@ -47,6 +47,7 @@ #include <linux/videodev.h> #include <linux/list.h> #include <linux/smp_lock.h> +#include <linux/mutex.h> struct cpia_camera_ops { @@ -246,7 +247,7 @@ enum v4l_camstates { struct cam_data { struct list_head cam_data_list; - struct semaphore busy_lock; /* guard against SMP multithreading */ + struct mutex busy_lock; /* guard against SMP multithreading */ struct cpia_camera_ops *ops; /* lowlevel driver operations */ void *lowlevel_data; /* private data for lowlevel driver */ u8 *raw_image; /* buffer for raw image data */ @@ -261,7 +262,7 @@ struct cam_data { u8 mainsFreq; /* for flicker control */ /* proc interface */ - struct semaphore param_lock; /* params lock for this camera */ + struct mutex param_lock; /* params lock for this camera */ struct cam_params params; /* camera settings */ struct proc_dir_entry *proc_entry; /* /proc/cpia/videoX */ |