diff options
| author | Eric Miao <eric.miao@linaro.org> | 2011-10-18 21:27:29 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-11-15 16:28:22 +0800 |
| commit | d4b6c968d1d655d8200feda5cb608019ce98c699 (patch) | |
| tree | 12583308c0a327a5465922f849659e69a4b79d66 | |
| parent | f6d40da915de5c450dcbdbb28990d3eb8cbb036c (diff) | |
SAUCE: fix imx_pcm_new() to allocate dma buffer correctly
BugLink: http://bugs.launchpad.net/bugs/877165
imx_pcm_new() calls imx_pcm_preallocate_dma_buffer() to allocate dma
buffers according _only_ to cpu_dai parameters, and this is not true.
A better way is to check out both cpu_dai and codec_dai.
Signed-off-by: Eric Miao <eric.miao@linaro.org>
| -rw-r--r-- | sound/soc/imx/imx-ssi.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c index d5f54b265fe..19f7fb94787 100644 --- a/sound/soc/imx/imx-ssi.c +++ b/sound/soc/imx/imx-ssi.c @@ -391,7 +391,8 @@ static u64 imx_pcm_dmamask = DMA_BIT_MASK(32); int imx_pcm_new(struct snd_soc_pcm_runtime *rtd) { struct snd_card *card = rtd->card->snd_card; - struct snd_soc_dai *dai = rtd->cpu_dai; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_pcm *pcm = rtd->pcm; int ret = 0; @@ -399,14 +400,16 @@ int imx_pcm_new(struct snd_soc_pcm_runtime *rtd) card->dev->dma_mask = &imx_pcm_dmamask; if (!card->dev->coherent_dma_mask) card->dev->coherent_dma_mask = DMA_BIT_MASK(32); - if (dai->driver->playback.channels_min) { + if (cpu_dai->driver->playback.channels_min && + codec_dai->driver->playback.channels_min) { ret = imx_pcm_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_PLAYBACK); if (ret) goto out; } - if (dai->driver->capture.channels_min) { + if (cpu_dai->driver->capture.channels_min && + codec_dai->driver->capture.channels_min) { ret = imx_pcm_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_CAPTURE); if (ret) |