OSDN Git Service

ASoC: wm_adsp: Avoid calling snd_compr_stop_error from WDT expiry
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Thu, 4 Apr 2019 12:56:01 +0000 (13:56 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 4 Apr 2019 13:51:34 +0000 (20:51 +0700)
commitaa612f2b006aa3552871dabcd6a8e90e33f65e09
tree110656840bce5f8cf9b98d92e1cf67569deddb7f
parentfdf34366d3242d5eeffa1b4d9a3497ebf30a4ecb
ASoC: wm_adsp: Avoid calling snd_compr_stop_error from WDT expiry

It is unsafe to call snd_compr_stop_error from outside of the
compressed ops. Firstly the compressed device lock needs to be held
and secondly it queues error work to issue a trigger stop which
should not happen after the stream has been freed. To avoid these
issues use the same trick used for the IRQ handling, simply send a
snd_compr_fragment_elapsed to cause user-space to wake on the poll,
then report the error when user-space issues the pointer request
after it wakes.

Fixes: a2bcbc1b9ac2f ("ASoC: wm_adsp: Shutdown any compressed streams on DSP watchdog timeout")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@kernel.org
sound/soc/codecs/wm_adsp.c