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: d13bd412dce2 ("ALSA: hda - Manage kcontrol lists")
Link: https://lore.kernel.org/r/20211116071314.15065-3-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index a56f018d586f585f3bad2ac46b59bf6809841a2f..8ec73955170b4970c46e398166e84c780135bd27 100644 (file)
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1680,8 +1680,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);
 }