diff options
-rw-r--r-- | sound/mips/au1x00.c | 1 | ||||
-rw-r--r-- | sound/oss/dmasound/dmasound_atari.c | 5 |
2 files changed, 4 insertions, 2 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 | ||
diff --git a/sound/oss/dmasound/dmasound_atari.c b/sound/oss/dmasound/dmasound_atari.c index 1f4774123064..13c214466d3b 100644 --- a/sound/oss/dmasound/dmasound_atari.c +++ b/sound/oss/dmasound/dmasound_atari.c | |||
@@ -1277,7 +1277,7 @@ static irqreturn_t AtaInterrupt(int irq, void *dummy) | |||
1277 | * (almost) like on the TT. | 1277 | * (almost) like on the TT. |
1278 | */ | 1278 | */ |
1279 | write_sq_ignore_int = 0; | 1279 | write_sq_ignore_int = 0; |
1280 | return IRQ_HANDLED; | 1280 | goto out; |
1281 | } | 1281 | } |
1282 | 1282 | ||
1283 | if (!write_sq.active) { | 1283 | if (!write_sq.active) { |
@@ -1285,7 +1285,7 @@ static irqreturn_t AtaInterrupt(int irq, void *dummy) | |||
1285 | * the sq variables, so better don't do anything here. | 1285 | * the sq variables, so better don't do anything here. |
1286 | */ | 1286 | */ |
1287 | WAKE_UP(write_sq.sync_queue); | 1287 | WAKE_UP(write_sq.sync_queue); |
1288 | return IRQ_HANDLED; | 1288 | goto out; |
1289 | } | 1289 | } |
1290 | 1290 | ||
1291 | /* Probably ;) one frame is finished. Well, in fact it may be that a | 1291 | /* Probably ;) one frame is finished. Well, in fact it may be that a |
@@ -1322,6 +1322,7 @@ static irqreturn_t AtaInterrupt(int irq, void *dummy) | |||
1322 | /* We are not playing after AtaPlay(), so there | 1322 | /* We are not playing after AtaPlay(), so there |
1323 | is nothing to play any more. Wake up a process | 1323 | is nothing to play any more. Wake up a process |
1324 | waiting for audio output to drain. */ | 1324 | waiting for audio output to drain. */ |
1325 | out: | ||
1325 | spin_unlock(&dmasound.lock); | 1326 | spin_unlock(&dmasound.lock); |
1326 | return IRQ_HANDLED; | 1327 | return IRQ_HANDLED; |
1327 | } | 1328 | } |