ASoC: topology: Check return value of soc_tplg_create_tlv
[ Upstream commit 482db55ae8
]
Function soc_tplg_create_tlv can fail, so we should check if it succeded
or not and proceed appropriately.
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200327204729.397-3-amadeuszx.slawinski@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
04da88c86c
commit
db80b7cb17
|
@ -893,7 +893,13 @@ static int soc_tplg_dmixer_create(struct soc_tplg *tplg, unsigned int count,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* create any TLV data */
|
/* create any TLV data */
|
||||||
soc_tplg_create_tlv(tplg, &kc, &mc->hdr);
|
err = soc_tplg_create_tlv(tplg, &kc, &mc->hdr);
|
||||||
|
if (err < 0) {
|
||||||
|
dev_err(tplg->dev, "ASoC: failed to create TLV %s\n",
|
||||||
|
mc->hdr.name);
|
||||||
|
kfree(sm);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
/* pass control to driver for optional further init */
|
/* pass control to driver for optional further init */
|
||||||
err = soc_tplg_init_kcontrol(tplg, &kc,
|
err = soc_tplg_init_kcontrol(tplg, &kc,
|
||||||
|
@ -1354,7 +1360,13 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_dmixer_create(
|
||||||
}
|
}
|
||||||
|
|
||||||
/* create any TLV data */
|
/* create any TLV data */
|
||||||
soc_tplg_create_tlv(tplg, &kc[i], &mc->hdr);
|
err = soc_tplg_create_tlv(tplg, &kc[i], &mc->hdr);
|
||||||
|
if (err < 0) {
|
||||||
|
dev_err(tplg->dev, "ASoC: failed to create TLV %s\n",
|
||||||
|
mc->hdr.name);
|
||||||
|
kfree(sm);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
/* pass control to driver for optional further init */
|
/* pass control to driver for optional further init */
|
||||||
err = soc_tplg_init_kcontrol(tplg, &kc[i],
|
err = soc_tplg_init_kcontrol(tplg, &kc[i],
|
||||||
|
|
Loading…
Reference in New Issue