diff options
| author | Eric Miao <eric.miao@linaro.org> | 2011-10-18 21:27:29 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-12-02 14:41:00 +0800 |
| commit | c462022746f6d954f96d00c2dd20351fc98c402e (patch) | |
| tree | 0ebc1008c9c59fe7b2569f1a1ec19857b39754fe | |
| parent | a65e488908006822ce3434fdd3c3cca1681a1096 (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 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c index 0ac73336ffd..e1b66f12ec5 100644 --- a/sound/soc/imx/imx-ssi.c +++ b/sound/soc/imx/imx-ssi.c @@ -391,6 +391,9 @@ 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 *cpu_dai = rtd->cpu_dai; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + struct snd_pcm *pcm = rtd->pcm; int ret = 0; @@ -398,14 +401,17 @@ 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 (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { + + 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 (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) { + 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) |