X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=blobdiff_plain;f=sound%2Fsynth%2Femux%2Femux_oss.c;fp=sound%2Fsynth%2Femux%2Femux_oss.c;h=dfbfcfbe5dd26ccbd4c6cda719bf7b51e849b3c9;hp=3436816727c8190ff0f5e5960c38f62c7c01e886;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c diff --git a/sound/synth/emux/emux_oss.c b/sound/synth/emux/emux_oss.c index 343681672..dfbfcfbe5 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) emu = closure; snd_assert(arg != NULL && emu != NULL, return -ENXIO); - mutex_lock(&emu->register_mutex); + down(&emu->register_mutex); if (!snd_emux_inc_count(emu)) { - mutex_unlock(&emu->register_mutex); + up(&emu->register_mutex); return -EFAULT; } @@ -134,7 +134,7 @@ snd_emux_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure) if (p == NULL) { snd_printk("can't create port\n"); snd_emux_dec_count(emu); - mutex_unlock(&emu->register_mutex); + up(&emu->register_mutex); return -ENOMEM; } @@ -148,7 +148,7 @@ snd_emux_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure) snd_emux_reset_port(p); - mutex_unlock(&emu->register_mutex); + up(&emu->register_mutex); return 0; } @@ -191,13 +191,13 @@ snd_emux_close_seq_oss(struct snd_seq_oss_arg *arg) emu = p->emu; snd_assert(emu != NULL, return -ENXIO); - mutex_lock(&emu->register_mutex); + down(&emu->register_mutex); snd_emux_sounds_off_all(p); snd_soundfont_close_check(emu->sflist, SF_CLIENT_NO(p->chset.port)); snd_seq_event_port_detach(p->chset.client, p->chset.port); snd_emux_dec_count(emu); - mutex_unlock(&emu->register_mutex); + up(&emu->register_mutex); return 0; }