summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2007-07-02 13:19:07 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-07-02 16:39:37 +0400
commit1f750a782c0e9593a8d0981ea972f22334980955 (patch)
treeb6dfb4e201b440b5b1ba551e5b453cf113b1695d /sound
parent756813cac1d0172e1f93d977fe8bd1cd5086be21 (diff)
downloadlinux-1f750a782c0e9593a8d0981ea972f22334980955.tar.xz
[ARM] 4458/1: pxa: Fix CKEN usage and hence fix pxa suspend/resume
The PXA CKEN changes broken syspend/resume on the pxa27x. This patch corrects the problem and fixes another couple of bad references. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'sound')
-rw-r--r--sound/arm/pxa2xx-ac97.c2
-rw-r--r--sound/soc/pxa/pxa2xx-ac97.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 19c65a8d86a7..7bc2767e1584 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -361,7 +361,7 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
err:
if (card)
snd_card_free(card);
- if (CKEN & CKEN_AC97) {
+ if (CKEN & (1 << CKEN_AC97)) {
GCR |= GCR_ACLINK_OFF;
free_irq(IRQ_AC97, NULL);
pxa_set_cken(CKEN_AC97, 0);
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index b222755763e7..129d851b3151 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -300,7 +300,7 @@ static int pxa2xx_ac97_probe(struct platform_device *pdev)
return 0;
err:
- if (CKEN & CKEN_AC97) {
+ if (CKEN & (1 << CKEN_AC97)) {
GCR |= GCR_ACLINK_OFF;
free_irq(IRQ_AC97, NULL);
pxa_set_cken(CKEN_AC97, 0);