lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 086/280] ASoC: topology: free created components in tplg load error
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 304017d31df36fb61eb2ed3ebf65fb6870b3c731 ]

    Topology resources are no longer needed if any element failed to load.

    Signed-off-by: Bard liao <yung-chuan.liao@linux.intel.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/soc-topology.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
    index 66e77e020745..88a7e860b175 100644
    --- a/sound/soc/soc-topology.c
    +++ b/sound/soc/soc-topology.c
    @@ -2493,6 +2493,7 @@ int snd_soc_tplg_component_load(struct snd_soc_component *comp,
    struct snd_soc_tplg_ops *ops, const struct firmware *fw, u32 id)
    {
    struct soc_tplg tplg;
    + int ret;

    /* setup parsing context */
    memset(&tplg, 0, sizeof(tplg));
    @@ -2506,7 +2507,12 @@ int snd_soc_tplg_component_load(struct snd_soc_component *comp,
    tplg.bytes_ext_ops = ops->bytes_ext_ops;
    tplg.bytes_ext_ops_count = ops->bytes_ext_ops_count;

    - return soc_tplg_load(&tplg);
    + ret = soc_tplg_load(&tplg);
    + /* free the created components if fail to load topology */
    + if (ret)
    + snd_soc_tplg_component_remove(comp, SND_SOC_TPLG_INDEX_ALL);
    +
    + return ret;
    }
    EXPORT_SYMBOL_GPL(snd_soc_tplg_component_load);

    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-22 13:45    [W:2.080 / U:0.728 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site