]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: sti: Fix deadlock via snd_pcm_stop_xrun() call
authorTakashi Iwai <tiwai@suse.de>
Tue, 15 Mar 2022 16:41:58 +0000 (17:41 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 16 Mar 2022 16:39:28 +0000 (16:39 +0000)
commit6c37d6e4cbcd658afd213ebdb2955c5346bf7730
treeb5632cf661fccd478e11295963bf93f7565c3121
parenta34e874e75e3d2e5f61207c033d128865ecec2a3
ASoC: sti: Fix deadlock via snd_pcm_stop_xrun() call

This is essentially a revert of the commit 22bdc831ca40 ("ASoC: sti:
Use snd_pcm_stop_xrun() helper"), which converted the manual
snd_pcm_stop() calls with snd_pcm_stop_xrun().

The commit above introduced a deadlock as snd_pcm_stop_xrun() itself
takes the PCM stream lock while the caller already holds it.  Since
the conversion was done only for consistency reason and the open-call
with snd_pcm_stop() to the XRUN state is a correct usage, let's revert
the commit back as the fix.

Fixes: 22bdc831ca40 ("ASoC: sti: Use snd_pcm_stop_xrun() helper")
Reported-by: Daniel Palmer <daniel@0x0f.com>
Cc: Arnaud POULIQUEN <arnaud.pouliquen@st.com>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20220315091319.3351522-1-daniel@0x0f.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Link: https://lore.kernel.org/r/20220315164158.19804-1-tiwai@suse.de
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sti/uniperif_player.c
sound/soc/sti/uniperif_reader.c