diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-03-23 06:00:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 10:38:13 -0500 |
commit | 910f5d202ce39cc78de1bbb679285a3167de9fb2 (patch) | |
tree | 2c5b55c2b141aaf016c459beb397fc702c41b967 /sound/oss/i810_audio.c | |
parent | 82d4dc5adb0055393248ad4ab8de392fac708a12 (diff) |
[PATCH] sem2mutex: sound/oss/
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: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss/i810_audio.c')
-rw-r--r-- | sound/oss/i810_audio.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c index abc242abd5b1..dd2b871cdac5 100644 --- a/sound/oss/i810_audio.c +++ b/sound/oss/i810_audio.c | |||
@@ -100,6 +100,8 @@ | |||
100 | #include <linux/smp_lock.h> | 100 | #include <linux/smp_lock.h> |
101 | #include <linux/ac97_codec.h> | 101 | #include <linux/ac97_codec.h> |
102 | #include <linux/bitops.h> | 102 | #include <linux/bitops.h> |
103 | #include <linux/mutex.h> | ||
104 | |||
103 | #include <asm/uaccess.h> | 105 | #include <asm/uaccess.h> |
104 | 106 | ||
105 | #define DRIVER_VERSION "1.01" | 107 | #define DRIVER_VERSION "1.01" |
@@ -331,7 +333,7 @@ struct i810_state { | |||
331 | struct i810_card *card; /* Card info */ | 333 | struct i810_card *card; /* Card info */ |
332 | 334 | ||
333 | /* single open lock mechanism, only used for recording */ | 335 | /* single open lock mechanism, only used for recording */ |
334 | struct semaphore open_sem; | 336 | struct mutex open_mutex; |
335 | wait_queue_head_t open_wait; | 337 | wait_queue_head_t open_wait; |
336 | 338 | ||
337 | /* file mode */ | 339 | /* file mode */ |
@@ -2597,7 +2599,7 @@ found_virt: | |||
2597 | state->card = card; | 2599 | state->card = card; |
2598 | state->magic = I810_STATE_MAGIC; | 2600 | state->magic = I810_STATE_MAGIC; |
2599 | init_waitqueue_head(&dmabuf->wait); | 2601 | init_waitqueue_head(&dmabuf->wait); |
2600 | init_MUTEX(&state->open_sem); | 2602 | mutex_init(&state->open_mutex); |
2601 | file->private_data = state; | 2603 | file->private_data = state; |
2602 | dmabuf->trigger = 0; | 2604 | dmabuf->trigger = 0; |
2603 | 2605 | ||
@@ -3213,7 +3215,7 @@ static void __devinit i810_configure_clocking (void) | |||
3213 | state->card = card; | 3215 | state->card = card; |
3214 | state->magic = I810_STATE_MAGIC; | 3216 | state->magic = I810_STATE_MAGIC; |
3215 | init_waitqueue_head(&dmabuf->wait); | 3217 | init_waitqueue_head(&dmabuf->wait); |
3216 | init_MUTEX(&state->open_sem); | 3218 | mutex_init(&state->open_mutex); |
3217 | dmabuf->fmt = I810_FMT_STEREO | I810_FMT_16BIT; | 3219 | dmabuf->fmt = I810_FMT_STEREO | I810_FMT_16BIT; |
3218 | dmabuf->trigger = PCM_ENABLE_OUTPUT; | 3220 | dmabuf->trigger = PCM_ENABLE_OUTPUT; |
3219 | i810_set_spdif_output(state, -1, 0); | 3221 | i810_set_spdif_output(state, -1, 0); |