diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /sound/isa/gus/gus_main.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'sound/isa/gus/gus_main.c')
| -rw-r--r-- | sound/isa/gus/gus_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c index 6d15b3d18a87..53eeaf37007d 100644 --- a/sound/isa/gus/gus_main.c +++ b/sound/isa/gus/gus_main.c | |||
| @@ -225,7 +225,7 @@ int snd_gus_create(struct snd_card *card, | |||
| 225 | spin_lock_init(&gus->dma_lock); | 225 | spin_lock_init(&gus->dma_lock); |
| 226 | spin_lock_init(&gus->pcm_volume_level_lock); | 226 | spin_lock_init(&gus->pcm_volume_level_lock); |
| 227 | spin_lock_init(&gus->uart_cmd_lock); | 227 | spin_lock_init(&gus->uart_cmd_lock); |
| 228 | init_MUTEX(&gus->dma_mutex); | 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; |