linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / drivers / opl3 / opl3_seq.c

diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c
index 96762c9..56b1d1a 100644 (file)
--- a/sound/drivers/opl3/opl3_seq.c
+++ b/sound/drivers/opl3/opl3_seq.c
@@ -52,13 +52,13 @@ int snd_opl3_synth_setup(struct snd_opl3 * opl3)
 {
        int idx;
 
-       mutex_lock(&opl3->access_mutex);
+       down(&opl3->access_mutex);
        if (opl3->used) {
-               mutex_unlock(&opl3->access_mutex);
+               up(&opl3->access_mutex);
                return -EBUSY;
        }
        opl3->used++;
-       mutex_unlock(&opl3->access_mutex);
+       up(&opl3->access_mutex);
 
        snd_opl3_reset(opl3);
 
@@ -91,9 +91,9 @@ void snd_opl3_synth_cleanup(struct snd_opl3 * opl3)
        spin_unlock_irqrestore(&opl3->sys_timer_lock, flags);
 
        snd_opl3_reset(opl3);
-       mutex_lock(&opl3->access_mutex);
+       down(&opl3->access_mutex);
        opl3->used--;
-       mutex_unlock(&opl3->access_mutex);
+       up(&opl3->access_mutex);
 }
 
 static int snd_opl3_synth_use(void *private_data, struct snd_seq_port_subscribe * info)
@@ -203,9 +203,7 @@ static int snd_opl3_synth_create_port(struct snd_opl3 * opl3)
                                                      SNDRV_SEQ_PORT_CAP_SUBS_WRITE,
                                                      SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |
                                                      SNDRV_SEQ_PORT_TYPE_MIDI_GM |
-                                                     SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE |
-                                                     SNDRV_SEQ_PORT_TYPE_HARDWARE |
-                                                     SNDRV_SEQ_PORT_TYPE_SYNTHESIZER,
+                                                     SNDRV_SEQ_PORT_TYPE_SYNTH,
                                                      16, voices,
                                                      name);
        if (opl3->chset->port < 0) {