ASoC: Tegra: tegra_pcm_deallocate_dma_buffer: Don't OOPS
authorStephen Warren <swarren@nvidia.com>
Thu, 4 Aug 2011 22:44:42 +0000 (16:44 -0600)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 9 Aug 2011 00:40:57 +0000 (09:40 +0900)
Not all PCM devices have all sub-streams. Specifically, the SPDIF driver
only supports playback and hence has no capture substream. Check whether
a substream exists before dereferencing it, when de-allocating DMA
buffers in tegra_pcm_deallocate_dma_buffer.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
sound/soc/tegra/tegra_pcm.c

index ff86e5e3db68a49276574abba72afcf0269bef54..c7cfd96e991ef268bd7af9a43230f8197c1e617c 100644 (file)
@@ -309,9 +309,14 @@ static int tegra_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)
 
 static void tegra_pcm_deallocate_dma_buffer(struct snd_pcm *pcm, int stream)
 {
-       struct snd_pcm_substream *substream = pcm->streams[stream].substream;
-       struct snd_dma_buffer *buf = &substream->dma_buffer;
+       struct snd_pcm_substream *substream;
+       struct snd_dma_buffer *buf;
+
+       substream = pcm->streams[stream].substream;
+       if (!substream)
+               return;
 
+       buf = &substream->dma_buffer;
        if (!buf->area)
                return;