Unverified Commit 9f16d96e authored by Ziyi Guo's avatar Ziyi Guo Committed by Mark Brown
Browse files

ASoC: fsl_xcvr: Revert fix missing lock in fsl_xcvr_mode_put() 



This reverts commit f5142487 ("ASoC: fsl_xcvr: fix missing lock in fsl_xcvr_mode_put()").

The original patch attempted to acquire the card->controls_rwsem lock in
fsl_xcvr_mode_put(). However, this function is called from the upper ALSA
core function snd_ctl_elem_write(), which already holds the write lock on
controls_rwsem for the whole put operation. So there is no need to simply
hold the lock for fsl_xcvr_activate_ctl() again.

Acquiring the read lock while holding the write lock in the same thread
results in a deadlock and a hung task, as reported by Alexander Stein.

Fixes: f5142487 ("ASoC: fsl_xcvr: fix missing lock in fsl_xcvr_mode_put()")
Reported-by: default avatarAlexander Stein <alexander.stein@ew.tq-group.com>
Closes: https://lore.kernel.org/linux-sound/5056506.GXAFRqVoOG@steina-w/


Signed-off-by: default avatarZiyi Guo <n7l8m4@u.northwestern.edu>
Link: https://patch.msgid.link/20260210185714.556385-1-n7l8m4@u.northwestern.edu


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f14c94d2

sound/soc/fsl/fsl_xcvr.c

+0 −3
Original line number Diff line number Diff line
@@ -223,13 +223,10 @@ static int fsl_xcvr_mode_put(struct snd_kcontrol *kcontrol, 


	xcvr->mode = snd_soc_enum_item_to_val(e, item[0]);



	down_read(&card->snd_card->controls_rwsem);

	fsl_xcvr_activate_ctl(dai, fsl_xcvr_arc_mode_kctl.name,

			      (xcvr->mode == FSL_XCVR_MODE_ARC));

	fsl_xcvr_activate_ctl(dai, fsl_xcvr_earc_capds_kctl.name,

			      (xcvr->mode == FSL_XCVR_MODE_EARC));

	up_read(&card->snd_card->controls_rwsem);



	/* Allow playback for SPDIF only */

	rtd = snd_soc_get_pcm_runtime(card, card->dai_link);

	rtd->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream_count =