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/opl4/opl4_lib.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'sound/drivers/opl4/opl4_lib.c')
| -rw-r--r-- | sound/drivers/opl4/opl4_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c index ddfc10d04be2..4bc860ae02de 100644 --- a/sound/drivers/opl4/opl4_lib.c +++ b/sound/drivers/opl4/opl4_lib.c | |||
| @@ -214,7 +214,7 @@ int snd_opl4_create(struct snd_card *card, | |||
| 214 | opl4->fm_port = fm_port; | 214 | opl4->fm_port = fm_port; |
| 215 | opl4->pcm_port = pcm_port; | 215 | opl4->pcm_port = pcm_port; |
| 216 | spin_lock_init(&opl4->reg_lock); | 216 | spin_lock_init(&opl4->reg_lock); |
| 217 | init_MUTEX(&opl4->access_mutex); | 217 | mutex_init(&opl4->access_mutex); |
| 218 | 218 | ||
| 219 | err = snd_opl4_detect(opl4); | 219 | err = snd_opl4_detect(opl4); |
| 220 | if (err < 0) { | 220 | if (err < 0) { |