xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit 06764dc931848c3a9bc01a63bbf76a605408bb54 ]

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: 9058cbe1ee ("ALSA: jack: implement kctl creating for jack devices")
Link: https://lore.kernel.org/r/20211116071314.15065-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Takashi Iwai
2021-11-16 08:13:12 +01:00
committed by Greg Kroah-Hartman
parent f871cd8ee0
commit 49d76154ba
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/core/jack.c
View File

@@ -54,10 +54,13 @@ static int snd_jack_dev_free(struct snd_device *device)
struct snd_card *card = device->card; struct snd_card *card = device->card;
struct snd_jack_kctl *jack_kctl, *tmp_jack_kctl; struct snd_jack_kctl *jack_kctl, *tmp_jack_kctl;
down_write(&card->controls_rwsem);
list_for_each_entry_safe(jack_kctl, tmp_jack_kctl, &jack->kctl_list, list) { list_for_each_entry_safe(jack_kctl, tmp_jack_kctl, &jack->kctl_list, list) {
list_del_init(&jack_kctl->list); list_del_init(&jack_kctl->list);
snd_ctl_remove(card, jack_kctl->kctl); snd_ctl_remove(card, jack_kctl->kctl);
} }
up_write(&card->controls_rwsem);
if (jack->private_free) if (jack->private_free)
jack->private_free(jack); jack->private_free(jack);