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
/
isa
/
gus
/
gus_synth.c
diff --git
a/sound/isa/gus/gus_synth.c
b/sound/isa/gus/gus_synth.c
index
85a1b05
..
3e4d4d6
100644
(file)
--- a/
sound/isa/gus/gus_synth.c
+++ b/
sound/isa/gus/gus_synth.c
@@
-55,9
+55,9
@@
static int snd_gus_synth_use(void *private_data, struct snd_seq_port_subscribe *
if (info->voices > 32)
return -EINVAL;
if (info->voices > 32)
return -EINVAL;
-
down
(&gus->register_mutex);
+
mutex_lock
(&gus->register_mutex);
if (!snd_gus_use_inc(gus)) {
if (!snd_gus_use_inc(gus)) {
-
up
(&gus->register_mutex);
+
mutex_unlock
(&gus->register_mutex);
return -EFAULT;
}
for (idx = 0; idx < info->voices; idx++) {
return -EFAULT;
}
for (idx = 0; idx < info->voices; idx++) {
@@
-65,12
+65,12
@@
static int snd_gus_synth_use(void *private_data, struct snd_seq_port_subscribe *
if (voice == NULL) {
snd_gus_synth_free_voices(gus, info->sender.client, info->sender.port);
snd_gus_use_dec(gus);
if (voice == NULL) {
snd_gus_synth_free_voices(gus, info->sender.client, info->sender.port);
snd_gus_use_dec(gus);
-
up
(&gus->register_mutex);
+
mutex_unlock
(&gus->register_mutex);
return -EBUSY;
}
voice->index = idx;
}
return -EBUSY;
}
voice->index = idx;
}
-
up
(&gus->register_mutex);
+
mutex_unlock
(&gus->register_mutex);
return 0;
}
return 0;
}
@@
-79,10
+79,10
@@
static int snd_gus_synth_unuse(void *private_data, struct snd_seq_port_subscribe
struct snd_gus_port * port = private_data;
struct snd_gus_card * gus = port->gus;
struct snd_gus_port * port = private_data;
struct snd_gus_card * gus = port->gus;
-
down
(&gus->register_mutex);
+
mutex_lock
(&gus->register_mutex);
snd_gus_synth_free_voices(gus, info->sender.client, info->sender.port);
snd_gus_use_dec(gus);
snd_gus_synth_free_voices(gus, info->sender.client, info->sender.port);
snd_gus_use_dec(gus);
-
up
(&gus->register_mutex);
+
mutex_unlock
(&gus->register_mutex);
return 0;
}
return 0;
}
@@
-194,7
+194,9
@@
static int snd_gus_synth_create_port(struct snd_gus_card * gus, int idx)
&callbacks,
SNDRV_SEQ_PORT_CAP_WRITE | SNDRV_SEQ_PORT_CAP_SUBS_WRITE,
SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE |
&callbacks,
SNDRV_SEQ_PORT_CAP_WRITE | SNDRV_SEQ_PORT_CAP_SUBS_WRITE,
SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE |
- SNDRV_SEQ_PORT_TYPE_SYNTH,
+ SNDRV_SEQ_PORT_TYPE_SYNTH |
+ SNDRV_SEQ_PORT_TYPE_HARDWARE |
+ SNDRV_SEQ_PORT_TYPE_SYNTHESIZER,
16, 0,
name);
if (p->chset->port < 0) {
16, 0,
name);
if (p->chset->port < 0) {
@@
-223,7
+225,7
@@
static int snd_gus_synth_new_device(struct snd_seq_device *dev)
if (gus == NULL)
return -EINVAL;
if (gus == NULL)
return -EINVAL;
-
init_MUTEX
(&gus->register_mutex);
+
mutex_init
(&gus->register_mutex);
gus->gf1.seq_client = -1;
/* allocate new client */
gus->gf1.seq_client = -1;
/* allocate new client */