summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorCharles Keepax2016-02-19 15:44:41 +0100
committerMark Brown2016-02-20 19:08:19 +0100
commitc7dae7c4c60693286298e300b3d140c8cff46daa (patch)
tree276a4911fa5106e5ebdb9f0916b5a7db6cc6032d /sound/soc/codecs
parentASoC: wm_adsp: Return sample rate in wm_adsp_compr_pointer (diff)
downloadkernel-qcow2-linux-c7dae7c4c60693286298e300b3d140c8cff46daa.tar.gz
kernel-qcow2-linux-c7dae7c4c60693286298e300b3d140c8cff46daa.tar.xz
kernel-qcow2-linux-c7dae7c4c60693286298e300b3d140c8cff46daa.zip
ASoC: wm_adsp: Avoid narrow race condition on compr pointer
There is a very small window between then wm_adsp_compr_free gets call and when the DSP is actually powered down. If we get an IRQ from the DSP in this window then the wm_adsp_compr pointer will be NULL. This patch adds a check for this into the IRQ handler to avoid any issues when this happens. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm_adsp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 68b85ee67586..cb49a632462a 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -2845,7 +2845,7 @@ int wm_adsp_compr_handle_irq(struct wm_adsp *dsp)
goto out;
}
- if (compr->stream)
+ if (compr && compr->stream)
snd_compr_fragment_elapsed(compr->stream);
out: