aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/gus/gus_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa/gus/gus_main.c')
-rw-r--r--sound/isa/gus/gus_main.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index ada9209a93a6..b14d5d6d9a32 100644
--- a/sound/isa/gus/gus_main.c
+++ b/sound/isa/gus/gus_main.c
@@ -154,6 +154,14 @@ int snd_gus_create(struct snd_card *card,
154 gus = kzalloc(sizeof(*gus), GFP_KERNEL); 154 gus = kzalloc(sizeof(*gus), GFP_KERNEL);
155 if (gus == NULL) 155 if (gus == NULL)
156 return -ENOMEM; 156 return -ENOMEM;
157 spin_lock_init(&gus->reg_lock);
158 spin_lock_init(&gus->voice_alloc);
159 spin_lock_init(&gus->active_voice_lock);
160 spin_lock_init(&gus->event_lock);
161 spin_lock_init(&gus->dma_lock);
162 spin_lock_init(&gus->pcm_volume_level_lock);
163 spin_lock_init(&gus->uart_cmd_lock);
164 mutex_init(&gus->dma_mutex);
157 gus->gf1.irq = -1; 165 gus->gf1.irq = -1;
158 gus->gf1.dma1 = -1; 166 gus->gf1.dma1 = -1;
159 gus->gf1.dma2 = -1; 167 gus->gf1.dma2 = -1;
@@ -218,14 +226,6 @@ int snd_gus_create(struct snd_card *card,
218 gus->gf1.pcm_channels = pcm_channels; 226 gus->gf1.pcm_channels = pcm_channels;
219 gus->gf1.volume_ramp = 25; 227 gus->gf1.volume_ramp = 25;
220 gus->gf1.smooth_pan = 1; 228 gus->gf1.smooth_pan = 1;
221 spin_lock_init(&gus->reg_lock);
222 spin_lock_init(&gus->voice_alloc);
223 spin_lock_init(&gus->active_voice_lock);
224 spin_lock_init(&gus->event_lock);
225 spin_lock_init(&gus->dma_lock);
226 spin_lock_init(&gus->pcm_volume_level_lock);
227 spin_lock_init(&gus->uart_cmd_lock);
228 mutex_init(&gus->dma_mutex);
229 if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, gus, &ops)) < 0) { 229 if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, gus, &ops)) < 0) {
230 snd_gus_free(gus); 230 snd_gus_free(gus);
231 return err; 231 return err;