| From 0c763d8c72d2fa9505965186b9c641551dc7ca68 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 16 Nov 2021 08:18:12 +0100 |
| Subject: ASoC: topology: Add missing rwsem around snd_ctl_remove() calls |
| |
| From: Takashi Iwai <tiwai@suse.de> |
| |
| [ Upstream commit 7e567b5ae06315ef2d70666b149962e2bb4b97af ] |
| |
| 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: 8a9782346dcc ("ASoC: topology: Add topology core") |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Link: https://lore.kernel.org/r/20211116071812.18109-1-tiwai@suse.de |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/soc-topology.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c |
| index 0675ab3fec6c7..ff12f2aa4e51d 100644 |
| --- a/sound/soc/soc-topology.c |
| +++ b/sound/soc/soc-topology.c |
| @@ -1831,6 +1831,7 @@ EXPORT_SYMBOL_GPL(snd_soc_tplg_widget_remove_all); |
| /* remove dynamic controls from the component driver */ |
| int snd_soc_tplg_component_remove(struct snd_soc_component *comp, u32 index) |
| { |
| + struct snd_card *card = comp->card->snd_card; |
| struct snd_soc_dobj *dobj, *next_dobj; |
| int pass = SOC_TPLG_PASS_END; |
| |
| @@ -1838,6 +1839,7 @@ int snd_soc_tplg_component_remove(struct snd_soc_component *comp, u32 index) |
| while (pass >= SOC_TPLG_PASS_START) { |
| |
| /* remove mixer controls */ |
| + down_write(&card->controls_rwsem); |
| list_for_each_entry_safe(dobj, next_dobj, &comp->dobj_list, |
| list) { |
| |
| @@ -1870,6 +1872,7 @@ int snd_soc_tplg_component_remove(struct snd_soc_component *comp, u32 index) |
| break; |
| } |
| } |
| + up_write(&card->controls_rwsem); |
| pass--; |
| } |
| |
| -- |
| 2.33.0 |
| |