Unverified Commit 6ae4902f authored Jun 12, 2020 by Pierre-Louis Bossart Committed by Mark Brown Jun 15, 2020

ASoC: soc-topology: use devm_snd_soc_register_dai()



Use devm_ to avoid use-after-free KASAN reports and simplify error
handling.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
BugLink: https://github.com/thesofproject/linux/issues/2186
Link: https://lore.kernel.org/r/20200612205938.26415-3-pierre-louis.bossart@linux.intel.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 0fae253a

sound/soc/soc-topology.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1851,7 +1851,7 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg,
		list_add(&dai_drv->dobj.list, &tplg->comp->dobj_list);

		/* register the DAI to the component */
		dai = snd_soc_register_dai(tplg->comp, dai_drv, false);
		dai = devm_snd_soc_register_dai(tplg->comp->dev, tplg->comp, dai_drv, false);
		if (!dai)
		return -ENOMEM;

		@@ -1859,7 +1859,6 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg,
		ret = snd_soc_dapm_new_dai_widgets(dapm, dai);
		if (ret != 0) {
		dev_err(dai->dev, "Failed to create DAI widgets %d\n", ret);
		snd_soc_unregister_dai(dai);
		return ret;
		}

Admin message