diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-05 10:53:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-05 10:53:43 +0100 |
| commit | ab05e290265341377187bb968575d3b7c72f9644 (patch) | |
| tree | 44f5fc9afac69bdf5d4e519ef9ba41b82b525835 /sound/soc/pxa/pxa2xx-pcm.c | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
| parent | ac11a2b35cc25c77d28218aaf60e7f7c6c7ee5d3 (diff) | |
| download | op-kernel-dev-ab05e290265341377187bb968575d3b7c72f9644.zip op-kernel-dev-ab05e290265341377187bb968575d3b7c72f9644.tar.gz | |
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 c670d08..53b9fb1 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; |
