diff options
| author | Domen Puncer <domen.puncer@ultra.si> | 2006-06-25 05:49:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 10:01:25 -0700 |
| commit | 5e37ed37b1a70a65185736fbec543ca4ad64a673 (patch) | |
| tree | dc78a3dcd683303464af6355e0147714525dc955 /sound/oss | |
| parent | 7d93a1a53a72aa704a8fef6e0fb4f6c6cd6aa07a (diff) | |
| download | talos-op-linux-5e37ed37b1a70a65185736fbec543ca4ad64a673.tar.gz talos-op-linux-5e37ed37b1a70a65185736fbec543ca4ad64a673.zip | |
[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>
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/au1550_ac97.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c index 9011abe241ab..2e009427d633 100644 --- a/sound/oss/au1550_ac97.c +++ b/sound/oss/au1550_ac97.c @@ -213,7 +213,8 @@ rdcodec(struct ac97_codec *codec, u8 addr) } if (i == POLL_COUNT) { err("rdcodec: read poll expired!"); - return 0; + data = 0; + goto out; } /* wait for command done? @@ -226,7 +227,8 @@ rdcodec(struct ac97_codec *codec, u8 addr) } 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 @@ rdcodec(struct ac97_codec *codec, u8 addr) au_writel(PSC_AC97EVNT_CD, PSC_AC97EVNT); au_sync(); + out: spin_unlock_irqrestore(&s->lock, flags); return data; |
