diff options
author | Stephen Warren <swarren@nvidia.com> | 2011-08-04 18:44:42 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 20:40:57 -0400 |
commit | a96edd59b2bc88b3d1ea47e0ba48076d65db9302 (patch) | |
tree | b6c1ac738bd363db83e2ac7ec990474170591450 /sound | |
parent | 7cb0aa21a560595ba36ab8230a210471f330288f (diff) |
ASoC: Tegra: tegra_pcm_deallocate_dma_buffer: Don't OOPS
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
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/tegra/tegra_pcm.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c index ff86e5e3db68..c7cfd96e991e 100644 --- a/sound/soc/tegra/tegra_pcm.c +++ b/sound/soc/tegra/tegra_pcm.c | |||
@@ -309,9 +309,14 @@ static int tegra_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) | |||
309 | 309 | ||
310 | static void tegra_pcm_deallocate_dma_buffer(struct snd_pcm *pcm, int stream) | 310 | static void tegra_pcm_deallocate_dma_buffer(struct snd_pcm *pcm, int stream) |
311 | { | 311 | { |
312 | struct snd_pcm_substream *substream = pcm->streams[stream].substream; | 312 | struct snd_pcm_substream *substream; |
313 | struct snd_dma_buffer *buf = &substream->dma_buffer; | 313 | struct snd_dma_buffer *buf; |
314 | |||
315 | substream = pcm->streams[stream].substream; | ||
316 | if (!substream) | ||
317 | return; | ||
314 | 318 | ||
319 | buf = &substream->dma_buffer; | ||
315 | if (!buf->area) | 320 | if (!buf->area) |
316 | return; | 321 | return; |
317 | 322 | ||