Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 9516e531 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-5.0' of... 

Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.1 for refcount fix
parents 461d854c 19dd0777

sound/soc/soc-topology.c

+7 −1
Original line number Diff line number Diff line
@@ -2587,6 +2587,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));
@@ -2600,7 +2601,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);