提交 5e37ed37 编写于 作者: D Domen Puncer 提交者: Linus Torvalds

[PATCH] au1550_ac97: spin_unlock in error path

Error paths didn't spin_unlock.
Signed-off-by: NDomen Puncer <domen.puncer@ultra.si>
Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 7d93a1a5
...@@ -213,7 +213,8 @@ rdcodec(struct ac97_codec *codec, u8 addr) ...@@ -213,7 +213,8 @@ rdcodec(struct ac97_codec *codec, u8 addr)
} }
if (i == POLL_COUNT) { if (i == POLL_COUNT) {
err("rdcodec: read poll expired!"); err("rdcodec: read poll expired!");
return 0; data = 0;
goto out;
} }
/* wait for command done? /* wait for command done?
...@@ -226,7 +227,8 @@ rdcodec(struct ac97_codec *codec, u8 addr) ...@@ -226,7 +227,8 @@ rdcodec(struct ac97_codec *codec, u8 addr)
} }
if (i == POLL_COUNT) { if (i == POLL_COUNT) {
err("rdcodec: read cmdwait expired!"); err("rdcodec: read cmdwait expired!");
return 0; data = 0;
goto out;
} }
data = au_readl(PSC_AC97CDC) & 0xffff; data = au_readl(PSC_AC97CDC) & 0xffff;
...@@ -237,6 +239,7 @@ rdcodec(struct ac97_codec *codec, u8 addr) ...@@ -237,6 +239,7 @@ rdcodec(struct ac97_codec *codec, u8 addr)
au_writel(PSC_AC97EVNT_CD, PSC_AC97EVNT); au_writel(PSC_AC97EVNT_CD, PSC_AC97EVNT);
au_sync(); au_sync();
out:
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
return data; return data;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册