diff options
Diffstat (limited to 'sound/isa/gus/gus_synth.c')
-rw-r--r-- | sound/isa/gus/gus_synth.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/isa/gus/gus_synth.c b/sound/isa/gus/gus_synth.c index 85a1b051f09a..2767cc187ae3 100644 --- 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 * | |||
55 | 55 | ||
56 | if (info->voices > 32) | 56 | if (info->voices > 32) |
57 | return -EINVAL; | 57 | return -EINVAL; |
58 | down(&gus->register_mutex); | 58 | mutex_lock(&gus->register_mutex); |
59 | if (!snd_gus_use_inc(gus)) { | 59 | if (!snd_gus_use_inc(gus)) { |
60 | up(&gus->register_mutex); | 60 | mutex_unlock(&gus->register_mutex); |
61 | return -EFAULT; | 61 | return -EFAULT; |
62 | } | 62 | } |
63 | for (idx = 0; idx < info->voices; idx++) { | 63 | 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 * | |||
65 | if (voice == NULL) { | 65 | if (voice == NULL) { |
66 | snd_gus_synth_free_voices(gus, info->sender.client, info->sender.port); | 66 | snd_gus_synth_free_voices(gus, info->sender.client, info->sender.port); |
67 | snd_gus_use_dec(gus); | 67 | snd_gus_use_dec(gus); |
68 | up(&gus->register_mutex); | 68 | mutex_unlock(&gus->register_mutex); |
69 | return -EBUSY; | 69 | return -EBUSY; |
70 | } | 70 | } |
71 | voice->index = idx; | 71 | voice->index = idx; |
72 | } | 72 | } |
73 | up(&gus->register_mutex); | 73 | mutex_unlock(&gus->register_mutex); |
74 | return 0; | 74 | return 0; |
75 | } | 75 | } |
76 | 76 | ||
@@ -79,10 +79,10 @@ static int snd_gus_synth_unuse(void *private_data, struct snd_seq_port_subscribe | |||
79 | struct snd_gus_port * port = private_data; | 79 | struct snd_gus_port * port = private_data; |
80 | struct snd_gus_card * gus = port->gus; | 80 | struct snd_gus_card * gus = port->gus; |
81 | 81 | ||
82 | down(&gus->register_mutex); | 82 | mutex_lock(&gus->register_mutex); |
83 | snd_gus_synth_free_voices(gus, info->sender.client, info->sender.port); | 83 | snd_gus_synth_free_voices(gus, info->sender.client, info->sender.port); |
84 | snd_gus_use_dec(gus); | 84 | snd_gus_use_dec(gus); |
85 | up(&gus->register_mutex); | 85 | mutex_unlock(&gus->register_mutex); |
86 | return 0; | 86 | return 0; |
87 | } | 87 | } |
88 | 88 | ||
@@ -223,7 +223,7 @@ static int snd_gus_synth_new_device(struct snd_seq_device *dev) | |||
223 | if (gus == NULL) | 223 | if (gus == NULL) |
224 | return -EINVAL; | 224 | return -EINVAL; |
225 | 225 | ||
226 | init_MUTEX(&gus->register_mutex); | 226 | mutex_init(&gus->register_mutex); |
227 | gus->gf1.seq_client = -1; | 227 | gus->gf1.seq_client = -1; |
228 | 228 | ||
229 | /* allocate new client */ | 229 | /* allocate new client */ |