From: Mark Brown Date: Wed, 19 Aug 2009 18:31:46 +0000 (+0100) Subject: ALSA: Restore support for DMAless DAIs on PXA X-Git-Tag: v2.6.33-rc3~4^2~185 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8bae4caaaf56c391f3e2380dd7105e765414178;p=platform%2Fkernel%2Flinux-3.10.git ALSA: Restore support for DMAless DAIs on PXA Used for applications such as direct bluetooth connections on smartphones which don't go via the CPU. This used to be supported before the refactoring to share code but this check was removed during that move. Signed-off-by: Mark Brown --- diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c index 6205f37..743ac6a 100644 --- a/sound/arm/pxa2xx-pcm-lib.c +++ b/sound/arm/pxa2xx-pcm-lib.c @@ -136,6 +136,9 @@ int __pxa2xx_pcm_prepare(struct snd_pcm_substream *substream) { struct pxa2xx_runtime_data *prtd = substream->runtime->private_data; + if (!prtd || !prtd->params) + return 0; + DCSR(prtd->dma_ch) &= ~DCSR_RUN; DCSR(prtd->dma_ch) = 0; DCMD(prtd->dma_ch) = 0;