diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-01-05 04:53:43 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-01-05 04:53:43 -0500 |
commit | ab05e290265341377187bb968575d3b7c72f9644 (patch) | |
tree | 44f5fc9afac69bdf5d4e519ef9ba41b82b525835 /sound/soc/pxa/pxa2xx-pcm.c | |
parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
parent | ac11a2b35cc25c77d28218aaf60e7f7c6c7ee5d3 (diff) |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/pxa/pxa2xx-pcm.c')
-rw-r--r-- | sound/soc/pxa/pxa2xx-pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index c670d08e7c9..53b9fb127a6 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) | |||
61 | 61 | ||
62 | __pxa2xx_pcm_hw_free(substream); | 62 | __pxa2xx_pcm_hw_free(substream); |
63 | 63 | ||
64 | if (prtd->dma_ch) { | 64 | if (prtd->dma_ch >= 0) { |
65 | pxa_free_dma(prtd->dma_ch); | 65 | pxa_free_dma(prtd->dma_ch); |
66 | prtd->dma_ch = 0; | 66 | prtd->dma_ch = -1; |
67 | } | 67 | } |
68 | 68 | ||
69 | return 0; | 69 | return 0; |