aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/kirkwood
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/kirkwood
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/kirkwood')
-rw-r--r--sound/soc/kirkwood/kirkwood-dma.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c
index 210438261a49..d4a17780cef4 100644
--- a/sound/soc/kirkwood/kirkwood-dma.c
+++ b/sound/soc/kirkwood/kirkwood-dma.c
@@ -315,7 +315,6 @@ static int kirkwood_dma_preallocate_dma_buffer(struct snd_pcm *pcm,
315static int kirkwood_dma_new(struct snd_soc_pcm_runtime *rtd) 315static int kirkwood_dma_new(struct snd_soc_pcm_runtime *rtd)
316{ 316{
317 struct snd_card *card = rtd->card->snd_card; 317 struct snd_card *card = rtd->card->snd_card;
318 struct snd_soc_dai *dai = rtd->cpu_dai;
319 struct snd_pcm *pcm = rtd->pcm; 318 struct snd_pcm *pcm = rtd->pcm;
320 int ret; 319 int ret;
321 320
@@ -324,14 +323,14 @@ static int kirkwood_dma_new(struct snd_soc_pcm_runtime *rtd)
324 if (!card->dev->coherent_dma_mask) 323 if (!card->dev->coherent_dma_mask)
325 card->dev->coherent_dma_mask = 0xffffffff; 324 card->dev->coherent_dma_mask = 0xffffffff;
326 325
327 if (dai->driver->playback.channels_min) { 326 if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
328 ret = kirkwood_dma_preallocate_dma_buffer(pcm, 327 ret = kirkwood_dma_preallocate_dma_buffer(pcm,
329 SNDRV_PCM_STREAM_PLAYBACK); 328 SNDRV_PCM_STREAM_PLAYBACK);
330 if (ret) 329 if (ret)
331 return ret; 330 return ret;
332 } 331 }
333 332
334 if (dai->driver->capture.channels_min) { 333 if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
335 ret = kirkwood_dma_preallocate_dma_buffer(pcm, 334 ret = kirkwood_dma_preallocate_dma_buffer(pcm,
336 SNDRV_PCM_STREAM_CAPTURE); 335 SNDRV_PCM_STREAM_CAPTURE);
337 if (ret) 336 if (ret)