Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit faa5a0d2 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

ALSA: hda: Add missing rwsem around snd_ctl_remove() calls 

[ Upstream commit 80bd64af75b4bb11c0329bc66c35da2ddfb66d88 ]

snd_ctl_remove() has to be called with card->controls_rwsem held (when
called after the card instantiation).  This patch add the missing
rwsem calls around it.

Fixes: d13bd412 ("ALSA: hda - Manage kcontrol lists")
Link: https://lore.kernel.org/r/20211116071314.15065-3-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ce730475

sound/pci/hda/hda_codec.c

+3 −0
Original line number Diff line number Diff line
@@ -1608,8 +1608,11 @@ void snd_hda_ctls_clear(struct hda_codec *codec) 
{

	int i;

	struct hda_nid_item *items = codec->mixers.list;



	down_write(&codec->card->controls_rwsem);

	for (i = 0; i < codec->mixers.used; i++)

		snd_ctl_remove(codec->card, items[i].kctl);

	up_write(&codec->card->controls_rwsem);

	snd_array_free(&codec->mixers);

	snd_array_free(&codec->nids);

}