diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 10:58:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 10:58:45 -0700 |
commit | f589274533eb94e0217acc1db6240ce6e621bb56 (patch) | |
tree | 884d4fde45bd578a240b4a61fe8de3b6a4c13880 /sound/soc/at91/at91-ssc.c | |
parent | 625fc3a37511cbecfe1253867fe105c28d6a95f0 (diff) | |
parent | e3a2efa67a029453b8098dba179ec2d9d8df612e (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] soc at91 minor bug fixes
[ALSA] soc - at91-pcm - Fix line wrapping
pcspkr: fix dependancies
Diffstat (limited to 'sound/soc/at91/at91-ssc.c')
-rw-r--r-- | sound/soc/at91/at91-ssc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/at91/at91-ssc.c b/sound/soc/at91/at91-ssc.c index f642d2dd4ec..bc35d00a38f 100644 --- a/sound/soc/at91/at91-ssc.c +++ b/sound/soc/at91/at91-ssc.c @@ -590,7 +590,7 @@ static int at91_ssc_hw_params(struct snd_pcm_substream *substream, printk(KERN_WARNING "at91-ssc: request_irq failure\n"); DBG("Stopping pid %d clock\n", ssc_p->ssc.pid); - at91_sys_write(AT91_PMC_PCER, 1<<ssc_p->ssc.pid); + at91_sys_write(AT91_PMC_PCDR, 1<<ssc_p->ssc.pid); return ret; } |