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/saa7134/saa7134.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/saa7134/saa7134.h')
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index ff39a63c7372..691c10be459d 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/input.h> | 29 | #include <linux/input.h> |
30 | #include <linux/notifier.h> | 30 | #include <linux/notifier.h> |
31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
32 | #include <linux/mutex.h> | ||
32 | 33 | ||
33 | #include <asm/io.h> | 34 | #include <asm/io.h> |
34 | 35 | ||
@@ -364,7 +365,7 @@ struct saa7134_fh { | |||
364 | 365 | ||
365 | /* dmasound dsp status */ | 366 | /* dmasound dsp status */ |
366 | struct saa7134_dmasound { | 367 | struct saa7134_dmasound { |
367 | struct semaphore lock; | 368 | struct mutex lock; |
368 | int minor_mixer; | 369 | int minor_mixer; |
369 | int minor_dsp; | 370 | int minor_dsp; |
370 | unsigned int users_dsp; | 371 | unsigned int users_dsp; |
@@ -428,7 +429,7 @@ struct saa7134_mpeg_ops { | |||
428 | /* global device status */ | 429 | /* global device status */ |
429 | struct saa7134_dev { | 430 | struct saa7134_dev { |
430 | struct list_head devlist; | 431 | struct list_head devlist; |
431 | struct semaphore lock; | 432 | struct mutex lock; |
432 | spinlock_t slock; | 433 | spinlock_t slock; |
433 | #ifdef VIDIOC_G_PRIORITY | 434 | #ifdef VIDIOC_G_PRIORITY |
434 | struct v4l2_prio_state prio; | 435 | struct v4l2_prio_state prio; |