commit 5e37ed37b1a70a65185736fbec543ca4ad64a673
author Domen Puncer <domen.puncer@ultra.si> Sun Jun 25 05:49:27 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sun Jun 25 10:01:25 2006 -0700
tree dc78a3dcd683303464af6355e0147714525dc955
parent 7d93a1a53a72aa704a8fef6e0fb4f6c6cd6aa07a

[PATCH] au1550_ac97: spin_unlock in error path

Error paths didn't spin_unlock.

Signed-off-by: Domen Puncer <domen.puncer@ultra.si>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

sound/oss/au1550_ac97.c

diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index 9011abe..2e00942 100644
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -213,7 +213,8 @@
 	}
 	if (i == POLL_COUNT) {
 		err("rdcodec: read poll expired!");
-		return 0;
+		data = 0;
+		goto out;
 	}
 
 	/* wait for command done?
@@ -226,7 +227,8 @@
 	}
 	if (i == POLL_COUNT) {
 		err("rdcodec: read cmdwait expired!");
-		return 0;
+		data = 0;
+		goto out;
 	}
 
 	data = au_readl(PSC_AC97CDC) & 0xffff;
@@ -237,6 +239,7 @@
 	au_writel(PSC_AC97EVNT_CD, PSC_AC97EVNT);
 	au_sync();
 
+ out:
 	spin_unlock_irqrestore(&s->lock, flags);
 
 	return data;