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