diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-05 19:10:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-05 19:10:16 -0400 |
| commit | 7e8767dddf3ad863a7013c334392e09177b48e2c (patch) | |
| tree | 539597f8786439ee3e27819a5cd194da147fd7be /sound | |
| parent | cab8e5c4444cb7d9b8035de5d81fbfd5284a02fa (diff) | |
| parent | 082f47a79bfc8a526b9a3e14a0ae9504fc09cc12 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] always allow dump_stack() to produce a backtrace
[ARM] Fix non-page aligned boot time mappings
[ARM] 4458/1: pxa: Fix CKEN usage and hence fix pxa suspend/resume
[ARM] 4454/1: Use word accesses in Versatile PCI config reads
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/arm/pxa2xx-ac97.c | 2 | ||||
| -rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 19c65a8d86..7bc2767e15 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) | |||
| 361 | err: | 361 | err: |
| 362 | if (card) | 362 | if (card) |
| 363 | snd_card_free(card); | 363 | snd_card_free(card); |
| 364 | if (CKEN & CKEN_AC97) { | 364 | if (CKEN & (1 << CKEN_AC97)) { |
| 365 | GCR |= GCR_ACLINK_OFF; | 365 | GCR |= GCR_ACLINK_OFF; |
| 366 | free_irq(IRQ_AC97, NULL); | 366 | free_irq(IRQ_AC97, NULL); |
| 367 | pxa_set_cken(CKEN_AC97, 0); | 367 | pxa_set_cken(CKEN_AC97, 0); |
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index b222755763..129d851b31 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); |