ASoC: topology: free created components in tplg load error
[ 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>
This commit is contained in:
parent
764498fa2d
commit
c8380f42e8
1 changed files with 7 additions and 1 deletions
|
@ -1770,6 +1770,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));
|
||||
|
@ -1783,7 +1784,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);
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue