diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
| commit | f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b (patch) | |
| tree | c2c130a74be25b0b2dff992e1a195e2728bdaadd /sound/mips/au1x00.c | |
| parent | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'sound/mips/au1x00.c')
| -rw-r--r-- | sound/mips/au1x00.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c index 3e763d6a5d67..446cf9748664 100644 --- a/sound/mips/au1x00.c +++ b/sound/mips/au1x00.c | |||
| @@ -516,6 +516,7 @@ get the interrupt driven case to work efficiently */ | |||
| 516 | break; | 516 | break; |
| 517 | if (i == 0x5000) { | 517 | if (i == 0x5000) { |
| 518 | printk(KERN_ERR "au1000 AC97: AC97 command read timeout\n"); | 518 | printk(KERN_ERR "au1000 AC97: AC97 command read timeout\n"); |
| 519 | spin_unlock(&au1000->ac97_lock); | ||
| 519 | return 0; | 520 | return 0; |
| 520 | } | 521 | } |
| 521 | 522 | ||