diff options
| author |   Bard liao <yung-chuan.liao@linux.intel.com> | 2019-02-17 21:23:47 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2019-02-18 18:21:49 +0000 |
| commit | 304017d31df36fb61eb2ed3ebf65fb6870b3c731 (patch) | |
| tree | 69d8d880b7d7fd7851d5fbe71eb99bae98983d92 /sound | |
| parent | ASoC: samsung: i2s: Fix prescaler setting for the secondary DAI (diff) | |
| download | wireguard-linux-304017d31df36fb61eb2ed3ebf65fb6870b3c731.tar.xz wireguard-linux-304017d31df36fb61eb2ed3ebf65fb6870b3c731.zip | |
ASoC: topology: free created components in tplg load error
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-topology.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index fc79ec6927e3..731b963b6995 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -2487,6 +2487,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)); @@ -2500,7 +2501,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); |