diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-02-07 03:49:14 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-07 03:49:14 -0500 |
commit | 3593cab5d62c4c7abced1076710f9bc2d8847433 (patch) | |
tree | dd5dc21961f6b4aef6900b0c2eb63ce7c70aecd5 /drivers/media/video/meye.h | |
parent | 538f9630afbbe429ecbcdcf92536200293a8e4b3 (diff) |
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/meye.h')
-rw-r--r-- | drivers/media/video/meye.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h index e8cd897b0d20..0d09a0e3803c 100644 --- a/drivers/media/video/meye.h +++ b/drivers/media/video/meye.h | |||
@@ -260,6 +260,8 @@ | |||
260 | 260 | ||
261 | /* private API definitions */ | 261 | /* private API definitions */ |
262 | #include <linux/meye.h> | 262 | #include <linux/meye.h> |
263 | #include <linux/mutex.h> | ||
264 | |||
263 | 265 | ||
264 | /* Enable jpg software correction */ | 266 | /* Enable jpg software correction */ |
265 | #define MEYE_JPEG_CORRECTION 1 | 267 | #define MEYE_JPEG_CORRECTION 1 |
@@ -301,7 +303,7 @@ struct meye { | |||
301 | /* list of buffers */ | 303 | /* list of buffers */ |
302 | struct meye_grab_buffer grab_buffer[MEYE_MAX_BUFNBRS]; | 304 | struct meye_grab_buffer grab_buffer[MEYE_MAX_BUFNBRS]; |
303 | int vma_use_count[MEYE_MAX_BUFNBRS]; /* mmap count */ | 305 | int vma_use_count[MEYE_MAX_BUFNBRS]; /* mmap count */ |
304 | struct semaphore lock; /* semaphore for open/mmap... */ | 306 | struct mutex lock; /* mutex for open/mmap... */ |
305 | struct kfifo *grabq; /* queue for buffers to be grabbed */ | 307 | struct kfifo *grabq; /* queue for buffers to be grabbed */ |
306 | spinlock_t grabq_lock; /* lock protecting the queue */ | 308 | spinlock_t grabq_lock; /* lock protecting the queue */ |
307 | struct kfifo *doneq; /* queue for grabbed buffers */ | 309 | struct kfifo *doneq; /* queue for grabbed buffers */ |