[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>
This commit is contained in:
parent
7d93a1a53a
commit
5e37ed37b1
1 changed files with 5 additions and 2 deletions
|
@ -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)
|
||||||
}
|
}
|
||||||
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)
|
||||||
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;
|
||||||
|
|
Loading…
Add table
Reference in a new issue