diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-08-19 16:42:01 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-08-19 16:42:01 -0700 |
| commit | 312effedac183148411c965e20a62e73f23979f6 (patch) | |
| tree | 81e466e84e7a2ebe9ee53e5d0963dc2d3c3f7356 /sound/soc/tegra/tegra_pcm.c | |
| parent | d3828df964e542533765b23f9a343657c7860e17 (diff) | |
| parent | dbf7603a92cd895b8c1017734bc30fd9a32fd933 (diff) | |
Merge branch 'upstream/linaro-3.0' into linaro-android-3.0linux-linaro-3.0-2011.08-0-android-1
Diffstat (limited to 'sound/soc/tegra/tegra_pcm.c')
| -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 3c271f95358..620171051e6 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) 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; |