summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorStephen Ware <stephen.ware@eqware.net>2008-12-31 14:39:23 -0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-01 11:52:48 +0000
commit9bef6489d72abd8f598aede92be3854a69324c50 (patch)
treefeacfd87f5fb52fcd39086189a3443c6c4b9fead /sound
parent276c62225a7c98737510483dcaec6af7e7965389 (diff)
downloadlinux-9bef6489d72abd8f598aede92be3854a69324c50.tar.gz
linux-9bef6489d72abd8f598aede92be3854a69324c50.tar.bz2
linux-9bef6489d72abd8f598aede92be3854a69324c50.zip
ASoC: Fix pxa2xx-pcm checks for invalid DMA channels
Set the invalid dma channel to -1 (and check properly for it) in pxa2xx_pcm_hw_free(). Was assuming 0 is an invalid channel number but 0 is a valid pxa dma channel num. Signed-off-by: stephen <stephen.ware@eqware.net> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/pxa/pxa2xx-pcm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c
index c670d08e7c9e..53b9fb127a6d 100644
--- a/sound/soc/pxa/pxa2xx-pcm.c
+++ b/sound/soc/pxa/pxa2xx-pcm.c
@@ -61,9 +61,9 @@ static int pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream)
__pxa2xx_pcm_hw_free(substream);
- if (prtd->dma_ch) {
+ if (prtd->dma_ch >= 0) {
pxa_free_dma(prtd->dma_ch);
- prtd->dma_ch = 0;
+ prtd->dma_ch = -1;
}
return 0;