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/drivers/opl3/opl3_lib.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'sound/drivers/opl3/opl3_lib.c')
| -rw-r--r-- | sound/drivers/opl3/opl3_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c index 1e0c76b9acfc..4f8556976774 100644 --- a/sound/drivers/opl3/opl3_lib.c +++ b/sound/drivers/opl3/opl3_lib.c | |||
| @@ -358,7 +358,7 @@ int snd_opl3_new(struct snd_card *card, | |||
| 358 | opl3->hardware = hardware; | 358 | opl3->hardware = hardware; |
| 359 | spin_lock_init(&opl3->reg_lock); | 359 | spin_lock_init(&opl3->reg_lock); |
| 360 | spin_lock_init(&opl3->timer_lock); | 360 | spin_lock_init(&opl3->timer_lock); |
| 361 | init_MUTEX(&opl3->access_mutex); | 361 | mutex_init(&opl3->access_mutex); |
| 362 | 362 | ||
| 363 | if ((err = snd_device_new(card, SNDRV_DEV_CODEC, opl3, &ops)) < 0) { | 363 | if ((err = snd_device_new(card, SNDRV_DEV_CODEC, opl3, &ops)) < 0) { |
| 364 | snd_opl3_free(opl3); | 364 | snd_opl3_free(opl3); |