diff options
| author | Cezary Rojewski | 2022-11-16 12:55:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2022-12-31 13:32:14 +0100 |
| commit | bfa34e24ced68067af77acd5c3b91cd6c1d0c3c4 (patch) | |
| tree | 13ad7634c2b974851a4b21f69c66504c8a6eb616 /sound | |
| parent | 51618c1d77af4c4e1dd326ec384a82fd7279b561 (diff) | |
ASoC: Intel: avs: Lock substream before snd_pcm_stop()
[ Upstream commit c30c8f9d51ec24b36e2c65a6307a5c8cbc5a0ebc ]
snd_pcm_stop() shall be called with stream lock held to prevent any
races between nonatomic streaming operations.
Fixes: 2f1f570cd730 ("ASoC: Intel: avs: Coredump and recovery flow")
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20221116115550.1100398-2-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/avs/ipc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/intel/avs/ipc.c b/sound/soc/intel/avs/ipc.c index 77da206f7dbb..306f0dc4eaf5 100644 --- a/sound/soc/intel/avs/ipc.c +++ b/sound/soc/intel/avs/ipc.c @@ -123,7 +123,10 @@ static void avs_dsp_recovery(struct avs_dev *adev) if (!substream || !substream->runtime) continue; + /* No need for _irq() as we are in nonatomic context. */ + snd_pcm_stream_lock(substream); snd_pcm_stop(substream, SNDRV_PCM_STATE_DISCONNECTED); + snd_pcm_stream_unlock(substream); } } } |