Unverified Commit 304017d3 authored by Bard liao's avatar Bard liao Committed by Mark Brown
Browse files

ASoC: topology: free created components in tplg load error 



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

Signed-off-by: default avatarBard liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 323fb7b9

sound/soc/soc-topology.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -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 snd_soc_tplg_ops *ops, const struct firmware *fw, u32 id)

{

{

	struct soc_tplg tplg;

	struct soc_tplg tplg;

	int ret;





	/* setup parsing context */

	/* setup parsing context */

	memset(&tplg, 0, sizeof(tplg));

	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 = ops->bytes_ext_ops;

	tplg.bytes_ext_ops_count = ops->bytes_ext_ops_count;

	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);

EXPORT_SYMBOL_GPL(snd_soc_tplg_component_load);