diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-11-16 08:13:14 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-27 08:46:15 +0100 |
| commit | c3e4e1d1d4c06d11b1429a07e46804ac03073828 (patch) | |
| tree | 5aef1d48082038674aadd896f416ee5104c0cb91 /sound | |
| parent | beda1b1318042fd4c9ad80b9c6f04ddfe15960ff (diff) | |
| download | linux-stable-c3e4e1d1d4c06d11b1429a07e46804ac03073828.tar.gz linux-stable-c3e4e1d1d4c06d11b1429a07e46804ac03073828.tar.bz2 linux-stable-c3e4e1d1d4c06d11b1429a07e46804ac03073828.zip | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 4962a9d8a572..7533f8860c57 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -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); } |