diff options
author | Richard Purdie <rpurdie@rpsys.net> | 2007-07-02 05:19:07 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-02 08:39:37 -0400 |
commit | 1f750a782c0e9593a8d0981ea972f22334980955 (patch) | |
tree | b6dfb4e201b440b5b1ba551e5b453cf113b1695d /sound/soc | |
parent | 756813cac1d0172e1f93d977fe8bd1cd5086be21 (diff) |
[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/soc')
-rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
300 | return 0; | 300 | return 0; |
301 | 301 | ||
302 | err: | 302 | err: |
303 | if (CKEN & CKEN_AC97) { | 303 | if (CKEN & (1 << CKEN_AC97)) { |
304 | GCR |= GCR_ACLINK_OFF; | 304 | GCR |= GCR_ACLINK_OFF; |
305 | free_irq(IRQ_AC97, NULL); | 305 | free_irq(IRQ_AC97, NULL); |
306 | pxa_set_cken(CKEN_AC97, 0); | 306 | pxa_set_cken(CKEN_AC97, 0); |