git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[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
56b1d1a
..
96762c9
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;
{
int idx;
-
down
(&opl3->access_mutex);
+
mutex_lock
(&opl3->access_mutex);
if (opl3->used) {
if (opl3->used) {
-
up
(&opl3->access_mutex);
+
mutex_unlock
(&opl3->access_mutex);
return -EBUSY;
}
opl3->used++;
return -EBUSY;
}
opl3->used++;
-
up
(&opl3->access_mutex);
+
mutex_unlock
(&opl3->access_mutex);
snd_opl3_reset(opl3);
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);
spin_unlock_irqrestore(&opl3->sys_timer_lock, flags);
snd_opl3_reset(opl3);
-
down
(&opl3->access_mutex);
+
mutex_lock
(&opl3->access_mutex);
opl3->used--;
opl3->used--;
-
up
(&opl3->access_mutex);
+
mutex_unlock
(&opl3->access_mutex);
}
static int snd_opl3_synth_use(void *private_data, struct snd_seq_port_subscribe * info)
}
static int snd_opl3_synth_use(void *private_data, struct snd_seq_port_subscribe * info)
@@
-203,7
+203,9
@@
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_CAP_SUBS_WRITE,
SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |
SNDRV_SEQ_PORT_TYPE_MIDI_GM |
- SNDRV_SEQ_PORT_TYPE_SYNTH,
+ SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE |
+ SNDRV_SEQ_PORT_TYPE_HARDWARE |
+ SNDRV_SEQ_PORT_TYPE_SYNTHESIZER,
16, voices,
name);
if (opl3->chset->port < 0) {
16, voices,
name);
if (opl3->chset->port < 0) {