| From 18925a963995ccdab50a4b1fbdd6d4a346f79df0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 27 Mar 2020 16:47:28 -0400 |
| Subject: ASoC: topology: Check return value of pcm_new_ver |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> |
| |
| [ 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> |
| --- |
| sound/soc/soc-topology.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c |
| index 756dd23031063..2c6598e07dde3 100644 |
| --- a/sound/soc/soc-topology.c |
| +++ b/sound/soc/soc-topology.c |
| @@ -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 */ |
| -- |
| 2.20.1 |
| |