aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra/tegra_pcm.c
diff options
context:
space:
mode:
authorJoachim Eastwood <joachim.eastwood@jotron.com>2011-12-31 19:58:44 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-07 14:18:05 -0500
commit25e9e7565f9aa9e4b976387a3fab60bfaa4efac8 (patch)
tree4a937cd72ecbd52980d09799aab0092a0f1bb4b8 /sound/soc/tegra/tegra_pcm.c
parent739be96ab83755e10fd0c2b6a34c8a73254527f7 (diff)
ASoC: check for substream not channels_min in pcm engines
This is a follow up on 53dea36c70c1857 which fixes the other affected pcm engines. Description from 53dea36c70c1857: Don't rely on the codec's channels_min information to decide wheter or not allocate a substream's DMA buffer. Rather check if the substream itself was allocated previously. Without this patch I was seeing null-pointer dereferenc in atmel-pcm. Signed-off-by: Joachim Eastwood <joachim.eastwood@jotron.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/tegra/tegra_pcm.c')
-rw-r--r--sound/soc/tegra/tegra_pcm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c
index 90345ee138f3..c22431516ab2 100644
--- a/sound/soc/tegra/tegra_pcm.c
+++ b/sound/soc/tegra/tegra_pcm.c
@@ -330,7 +330,6 @@ static u64 tegra_dma_mask = DMA_BIT_MASK(32);
330static int tegra_pcm_new(struct snd_soc_pcm_runtime *rtd) 330static int tegra_pcm_new(struct snd_soc_pcm_runtime *rtd)
331{ 331{
332 struct snd_card *card = rtd->card->snd_card; 332 struct snd_card *card = rtd->card->snd_card;
333 struct snd_soc_dai *dai = rtd->cpu_dai;
334 struct snd_pcm *pcm = rtd->pcm; 333 struct snd_pcm *pcm = rtd->pcm;
335 int ret = 0; 334 int ret = 0;
336 335
@@ -339,14 +338,14 @@ static int tegra_pcm_new(struct snd_soc_pcm_runtime *rtd)
339 if (!card->dev->coherent_dma_mask) 338 if (!card->dev->coherent_dma_mask)
340 card->dev->coherent_dma_mask = 0xffffffff; 339 card->dev->coherent_dma_mask = 0xffffffff;
341 340
342 if (dai->driver->playback.channels_min) { 341 if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
343 ret = tegra_pcm_preallocate_dma_buffer(pcm, 342 ret = tegra_pcm_preallocate_dma_buffer(pcm,
344 SNDRV_PCM_STREAM_PLAYBACK); 343 SNDRV_PCM_STREAM_PLAYBACK);
345 if (ret) 344 if (ret)
346 goto err; 345 goto err;
347 } 346 }
348 347
349 if (dai->driver->capture.channels_min) { 348 if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
350 ret = tegra_pcm_preallocate_dma_buffer(pcm, 349 ret = tegra_pcm_preallocate_dma_buffer(pcm,
351 SNDRV_PCM_STREAM_CAPTURE); 350 SNDRV_PCM_STREAM_CAPTURE);
352 if (ret) 351 if (ret)