diff options
| author | Kai Vehmanen <kai.vehmanen@linux.intel.com> | 2020-01-24 15:36:22 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-01-27 17:52:09 +0000 |
| commit | e6110114d18d330c05fd6de9f31283fd086a5a3a (patch) | |
| tree | c40211cb7a850ea515cebca5948cf6ac28090d2d /sound/soc/sof | |
| parent | 410e5e55c9c1c9c0d452ac5b9adb37b933a7747e (diff) | |
| download | linux-stable-e6110114d18d330c05fd6de9f31283fd086a5a3a.tar.gz linux-stable-e6110114d18d330c05fd6de9f31283fd086a5a3a.tar.bz2 linux-stable-e6110114d18d330c05fd6de9f31283fd086a5a3a.zip | |
ASoC: SOF: trace: fix unconditional free in trace release
Check if DMA pages were successfully allocated in initialization
before calling free. For many types of memory (like sgbufs)
the extra free is harmless, but not all backends track allocation
state, so add an explicit check.
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200124213625.30186-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof')
| -rw-r--r-- | sound/soc/sof/trace.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/sof/trace.c b/sound/soc/sof/trace.c index 4bb65030819d..d815090252f8 100644 --- a/sound/soc/sof/trace.c +++ b/sound/soc/sof/trace.c @@ -343,7 +343,10 @@ void snd_sof_free_trace(struct snd_sof_dev *sdev) snd_sof_release_trace(sdev); - snd_dma_free_pages(&sdev->dmatb); - snd_dma_free_pages(&sdev->dmatp); + if (sdev->dma_trace_pages) { + snd_dma_free_pages(&sdev->dmatb); + snd_dma_free_pages(&sdev->dmatp); + sdev->dma_trace_pages = 0; + } } EXPORT_SYMBOL(snd_sof_free_trace); |