diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 06:28:29 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 06:28:29 -0400 |
| commit | 1b4610ebf37a05a65e9f29cdf4d87c207573104d (patch) | |
| tree | f2c035b44a47e4ea663449e7e2138524805d3eba /sound/arm | |
| parent | 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d (diff) | |
| parent | 97c96c076b8ef86533f2427ea145a9cd0ec5564f (diff) | |
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.39
Diffstat (limited to 'sound/arm')
| -rw-r--r-- | sound/arm/pxa2xx-pcm-lib.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c index 8808b82311b1..76e0d5695075 100644 --- a/sound/arm/pxa2xx-pcm-lib.c +++ b/sound/arm/pxa2xx-pcm-lib.c | |||
| @@ -140,6 +140,9 @@ int __pxa2xx_pcm_prepare(struct snd_pcm_substream *substream) | |||
| 140 | if (!prtd || !prtd->params) | 140 | if (!prtd || !prtd->params) |
| 141 | return 0; | 141 | return 0; |
| 142 | 142 | ||
| 143 | if (prtd->dma_ch == -1) | ||
| 144 | return -EINVAL; | ||
| 145 | |||
| 143 | DCSR(prtd->dma_ch) &= ~DCSR_RUN; | 146 | DCSR(prtd->dma_ch) &= ~DCSR_RUN; |
| 144 | DCSR(prtd->dma_ch) = 0; | 147 | DCSR(prtd->dma_ch) = 0; |
| 145 | DCMD(prtd->dma_ch) = 0; | 148 | DCMD(prtd->dma_ch) = 0; |