summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorWei Yongjun <weiyj.lk@gmail.com>2016-08-10 13:43:12 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-31 04:14:00 -0600
commit41b4b00e6daa22c75bd6a8961fa2aef3370c9d8c (patch)
treeb8ce6d2b338832c86f9f53c2dcac97c8e10b10c0 /sound/soc
parent1ea1d49d1630c1617cd04489faf419b0aeb18bfa (diff)
downloadlinux-stable-41b4b00e6daa22c75bd6a8961fa2aef3370c9d8c.tar.gz
linux-stable-41b4b00e6daa22c75bd6a8961fa2aef3370c9d8c.tar.bz2
linux-stable-41b4b00e6daa22c75bd6a8961fa2aef3370c9d8c.zip
ASoC: topology: Fix error return code in soc_tplg_dapm_widget_create()
commit 8ae3ea48df0d746b663057cf0b972a18d0777b7b upstream. Fix to return error code -ENOMEM instead of 0 when failed to create widget, as done elsewhere in this function. Fixes: 8a9782346dcc ("ASoC: topology: Add topology core") Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-topology.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 6963ba20991c..70396d3f6472 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1484,6 +1484,7 @@ widget:
if (widget == NULL) {
dev_err(tplg->dev, "ASoC: failed to create widget %s controls\n",
w->name);
+ ret = -ENOMEM;
goto hdr_err;
}