diff options
author | Patrik Sevallius <patrik.sevallius@enea.com> | 2008-05-08 08:04:08 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-05-08 07:08:58 -0400 |
commit | e3a2efa67a029453b8098dba179ec2d9d8df612e (patch) | |
tree | 8b5587d7268919a807aa1210ab3b9f10afeeb330 | |
parent | 30a717f7e951ec0260f31c0637ecf8e6268ba607 (diff) |
[ALSA] soc at91 minor bug fixes
Found these two bugs while browsing through the code. The first one is
a cut-n-paste bug, instead of disabling the clock when request_irq()
fails, it enabled it once more. The second one fixes a debug printout,
AT91_SSC_IER is write only, AT91_SSC_IMR is readable (the printed string
actually says imr).
Frank Mandarino was busy so he asked me to send these to this list.
/Patrik
Signed-off-by: Patrik Sevallius <patrik.sevallius@enea.com>
Acked-by: Frank Mandarino <fmandarino@endrelia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/soc/at91/at91-pcm.c | 2 | ||||
-rw-r--r-- | sound/soc/at91/at91-ssc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/at91/at91-pcm.c b/sound/soc/at91/at91-pcm.c index e36533d37964..ccac6bd2889c 100644 --- a/sound/soc/at91/at91-pcm.c +++ b/sound/soc/at91/at91-pcm.c | |||
@@ -197,7 +197,7 @@ static int at91_pcm_trigger(struct snd_pcm_substream *substream, | |||
197 | 197 | ||
198 | DBG("sr=%lx imr=%lx\n", | 198 | DBG("sr=%lx imr=%lx\n", |
199 | at91_ssc_read(params->ssc_base + AT91_SSC_SR), | 199 | at91_ssc_read(params->ssc_base + AT91_SSC_SR), |
200 | at91_ssc_read(params->ssc_base + AT91_SSC_IER)); | 200 | at91_ssc_read(params->ssc_base + AT91_SSC_IMR)); |
201 | break; | 201 | break; |
202 | 202 | ||
203 | case SNDRV_PCM_TRIGGER_STOP: | 203 | case SNDRV_PCM_TRIGGER_STOP: |
diff --git a/sound/soc/at91/at91-ssc.c b/sound/soc/at91/at91-ssc.c index f642d2dd4ec3..bc35d00a38f8 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, | |||
590 | printk(KERN_WARNING "at91-ssc: request_irq failure\n"); | 590 | printk(KERN_WARNING "at91-ssc: request_irq failure\n"); |
591 | 591 | ||
592 | DBG("Stopping pid %d clock\n", ssc_p->ssc.pid); | 592 | DBG("Stopping pid %d clock\n", ssc_p->ssc.pid); |
593 | at91_sys_write(AT91_PMC_PCER, 1<<ssc_p->ssc.pid); | 593 | at91_sys_write(AT91_PMC_PCDR, 1<<ssc_p->ssc.pid); |
594 | return ret; | 594 | return ret; |
595 | } | 595 | } |
596 | 596 | ||