diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
| commit | d62e54abca1146981fc9f98f85ff398a113a22c2 (patch) | |
| tree | 870420dbc4c65e716dcef8a802aafdc0ef97a8b4 /sound/drivers/opl4/opl4_lib.c | |
| parent | fd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (diff) | |
| parent | ce362c009250340358a7221f3cdb7954cbf19c01 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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) { |