diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-01-16 10:31:42 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 04:24:57 -0500 |
commit | ef9f0a42db987e7e2df72289fb4522d24027786b (patch) | |
tree | 34f3ad0c1abdbeb6df5a1d5137db6b4f34695f5a /sound/synth/emux/emux_oss.c | |
parent | 1a60d4c5a0c4028559585a74e48593b16e1ca9b2 (diff) |
[ALSA] semaphore -> mutex (driver part)
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: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/synth/emux/emux_oss.c')
-rw-r--r-- | sound/synth/emux/emux_oss.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/synth/emux/emux_oss.c b/sound/synth/emux/emux_oss.c index dfbfcfbe5dd2..3436816727c8 100644 --- a/sound/synth/emux/emux_oss.c +++ b/sound/synth/emux/emux_oss.c | |||
@@ -117,10 +117,10 @@ snd_emux_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure) | |||
117 | emu = closure; | 117 | emu = closure; |
118 | snd_assert(arg != NULL && emu != NULL, return -ENXIO); | 118 | snd_assert(arg != NULL && emu != NULL, return -ENXIO); |
119 | 119 | ||
120 | down(&emu->register_mutex); | 120 | mutex_lock(&emu->register_mutex); |
121 | 121 | ||
122 | if (!snd_emux_inc_count(emu)) { | 122 | if (!snd_emux_inc_count(emu)) { |
123 | up(&emu->register_mutex); | 123 | mutex_unlock(&emu->register_mutex); |
124 | return -EFAULT; | 124 | return -EFAULT; |
125 | } | 125 | } |
126 | 126 | ||
@@ -134,7 +134,7 @@ snd_emux_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure) | |||
134 | if (p == NULL) { | 134 | if (p == NULL) { |
135 | snd_printk("can't create port\n"); | 135 | snd_printk("can't create port\n"); |
136 | snd_emux_dec_count(emu); | 136 | snd_emux_dec_count(emu); |
137 | up(&emu->register_mutex); | 137 | mutex_unlock(&emu->register_mutex); |
138 | return -ENOMEM; | 138 | return -ENOMEM; |
139 | } | 139 | } |
140 | 140 | ||
@@ -148,7 +148,7 @@ snd_emux_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure) | |||
148 | 148 | ||
149 | snd_emux_reset_port(p); | 149 | snd_emux_reset_port(p); |
150 | 150 | ||
151 | up(&emu->register_mutex); | 151 | mutex_unlock(&emu->register_mutex); |
152 | return 0; | 152 | return 0; |
153 | } | 153 | } |
154 | 154 | ||
@@ -191,13 +191,13 @@ snd_emux_close_seq_oss(struct snd_seq_oss_arg *arg) | |||
191 | emu = p->emu; | 191 | emu = p->emu; |
192 | snd_assert(emu != NULL, return -ENXIO); | 192 | snd_assert(emu != NULL, return -ENXIO); |
193 | 193 | ||
194 | down(&emu->register_mutex); | 194 | mutex_lock(&emu->register_mutex); |
195 | snd_emux_sounds_off_all(p); | 195 | snd_emux_sounds_off_all(p); |
196 | snd_soundfont_close_check(emu->sflist, SF_CLIENT_NO(p->chset.port)); | 196 | snd_soundfont_close_check(emu->sflist, SF_CLIENT_NO(p->chset.port)); |
197 | snd_seq_event_port_detach(p->chset.client, p->chset.port); | 197 | snd_seq_event_port_detach(p->chset.client, p->chset.port); |
198 | snd_emux_dec_count(emu); | 198 | snd_emux_dec_count(emu); |
199 | 199 | ||
200 | up(&emu->register_mutex); | 200 | mutex_unlock(&emu->register_mutex); |
201 | return 0; | 201 | return 0; |
202 | } | 202 | } |
203 | 203 | ||