projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
146283f
)
staging: greybus: Add missing rwsem around snd_ctl_remove() calls
author
Takashi Iwai
<tiwai@suse.de>
Tue, 16 Nov 2021 07:20:27 +0000
(08:20 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 1 Dec 2021 08:19:00 +0000
(09:19 +0100)
commit
ffcf7ae90f4489047d7b076539ba207024dea5f6
upstream.
snd_ctl_remove() has to be called with card->controls_rwsem held (when
called after the card instantiation). This patch adds the missing
rwsem calls around it.
Fixes:
510e340efe0c
("staging: greybus: audio: Add helper APIs for dynamic audio modules")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link:
https://lore.kernel.org/r/20211116072027.18466-1-tiwai@suse.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/greybus/audio_helper.c
patch
|
blob
|
history
diff --git
a/drivers/staging/greybus/audio_helper.c
b/drivers/staging/greybus/audio_helper.c
index
3011b8a
..
a9576f9
100644
(file)
--- a/
drivers/staging/greybus/audio_helper.c
+++ b/
drivers/staging/greybus/audio_helper.c
@@
-192,7
+192,11
@@
int gbaudio_remove_component_controls(struct snd_soc_component *component,
unsigned int num_controls)
{
struct snd_card *card = component->card->snd_card;
+ int err;
- return gbaudio_remove_controls(card, component->dev, controls,
- num_controls, component->name_prefix);
+ down_write(&card->controls_rwsem);
+ err = gbaudio_remove_controls(card, component->dev, controls,
+ num_controls, component->name_prefix);
+ up_write(&card->controls_rwsem);
+ return err;
}