projects
/
GitHub
/
LineageOS
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
462711e
)
ALSA: jack: Add missing rwsem around snd_ctl_remove() calls
author
Takashi Iwai
<tiwai@suse.de>
Tue, 16 Nov 2021 07:13:12 +0000
(08:13 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 27 Jan 2022 08:00:52 +0000
(09:00 +0100)
[ 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:
9058cbe1eed2
("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>
sound/core/jack.c
patch
|
blob
|
blame
|
history
diff --git
a/sound/core/jack.c
b/sound/core/jack.c
index 5ddf81f091fa9e709e02d8e0c2f46a13528ba74b..36cfe1c54109db2cc75bdc21fa9d0c80c7614112 100644
(file)
--- a/
sound/core/jack.c
+++ b/
sound/core/jack.c
@@
-68,10
+68,13
@@
static int snd_jack_dev_free(struct snd_device *device)
struct snd_card *card = device->card;
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_del_init(&jack_kctl->list);
snd_ctl_remove(card, jack_kctl->kctl);
}
+ up_write(&card->controls_rwsem);
+
if (jack->private_free)
jack->private_free(jack);