linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / drivers / opl4 / opl4_seq.c

diff --git a/sound/drivers/opl4/opl4_seq.c b/sound/drivers/opl4/opl4_seq.c
index 43d8a2b..e348032 100644 (file)
--- a/sound/drivers/opl4/opl4_seq.c
+++ b/sound/drivers/opl4/opl4_seq.c
@@ -62,10 +62,10 @@ static int snd_opl4_seq_use(void *private_data, struct snd_seq_port_subscribe *i
        struct snd_opl4 *opl4 = private_data;
        int err;
 
-       mutex_lock(&opl4->access_mutex);
+       down(&opl4->access_mutex);
 
        if (opl4->used) {
-               mutex_unlock(&opl4->access_mutex);
+               up(&opl4->access_mutex);
                return -EBUSY;
        }
        opl4->used++;
@@ -73,12 +73,12 @@ static int snd_opl4_seq_use(void *private_data, struct snd_seq_port_subscribe *i
        if (info->sender.client != SNDRV_SEQ_CLIENT_SYSTEM) {
                err = snd_opl4_seq_use_inc(opl4);
                if (err < 0) {
-                       mutex_unlock(&opl4->access_mutex);
+                       up(&opl4->access_mutex);
                        return err;
                }
        }
 
-       mutex_unlock(&opl4->access_mutex);
+       up(&opl4->access_mutex);
 
        snd_opl4_synth_reset(opl4);
        return 0;
@@ -90,9 +90,9 @@ static int snd_opl4_seq_unuse(void *private_data, struct snd_seq_port_subscribe
 
        snd_opl4_synth_shutdown(opl4);
 
-       mutex_lock(&opl4->access_mutex);
+       down(&opl4->access_mutex);
        opl4->used--;
-       mutex_unlock(&opl4->access_mutex);
+       up(&opl4->access_mutex);
 
        if (info->sender.client != SNDRV_SEQ_CLIENT_SYSTEM)
                snd_opl4_seq_use_dec(opl4);
@@ -164,9 +164,7 @@ static int snd_opl4_seq_new_device(struct snd_seq_device *dev)
                                                      SNDRV_SEQ_PORT_CAP_WRITE |
                                                      SNDRV_SEQ_PORT_CAP_SUBS_WRITE,
                                                      SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |
-                                                     SNDRV_SEQ_PORT_TYPE_MIDI_GM |
-                                                     SNDRV_SEQ_PORT_TYPE_HARDWARE |
-                                                     SNDRV_SEQ_PORT_TYPE_SYNTHESIZER,
+                                                     SNDRV_SEQ_PORT_TYPE_MIDI_GM,
                                                      16, 24,
                                                      "OPL4 Wavetable Port");
        if (opl4->chset->port < 0) {