Commit eaec9f84 authored Mar 27, 2020 by Amadeusz Sławiński Committed by Greg Kroah-Hartman May 10, 2020

ASoC: topology: Check return value of pcm_new_ver



[ Upstream commit b3677fc3d68dd942c92de52f0bd9dd8b472a40e6 ]

Function pcm_new_ver can fail, so we should check it's return value and
handle possible error.

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-6-amadeuszx.slawinski@linux.intel.com


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

parent c56680ee

sound/soc/soc-topology.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1923,7 +1923,9 @@ static int soc_tplg_pcm_elems_load(struct soc_tplg *tplg,
		_pcm = pcm;
		} else {
		abi_match = false;
		pcm_new_ver(tplg, pcm, &_pcm);
		ret = pcm_new_ver(tplg, pcm, &_pcm);
		if (ret < 0)
		return ret;
		}

		/* create the FE DAIs and DAI links */