lkml.org 
[lkml]   [2021]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 14/62] ASoC: topology: Add missing rwsem around snd_ctl_remove() calls
    Date
    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 e9c57bd3c02bf..6274a50026473 100644
    --- a/sound/soc/soc-topology.c
    +++ b/sound/soc/soc-topology.c
    @@ -2050,6 +2050,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;

    @@ -2057,6 +2058,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) {

    @@ -2090,6 +2092,7 @@ int snd_soc_tplg_component_remove(struct snd_soc_component *comp, u32 index)
    break;
    }
    }
    + up_write(&card->controls_rwsem);
    pass--;
    }

    --
    2.33.0


    \
     
     \ /
      Last update: 2021-12-06 16:10    [W:3.506 / U:0.548 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site