summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-12-10 21:46:10 +0100
committerMark Brown <broonie@kernel.org>2018-12-11 01:08:51 +0000
commit2b320e046495e6cf02d1f0b1abf07042ac5635ea (patch)
treed2940be30ae2bed52fdaeb1f60f2f00307830dd8 /sound
parente9dc919043c56dccedce93fe402e6c94423a70b0 (diff)
downloadlinux-stable-2b320e046495e6cf02d1f0b1abf07042ac5635ea.tar.gz
linux-stable-2b320e046495e6cf02d1f0b1abf07042ac5635ea.tar.bz2
linux-stable-2b320e046495e6cf02d1f0b1abf07042ac5635ea.zip
ASoC: simple-card-utils: fix build warning without CONFIG_OF
When CONFIG_OF is disabled, of_graph_parse_endpoint() does not initialize 'info', and gcc can see that: sound/soc/generic/simple-card-utils.c: In function 'asoc_simple_card_parse_graph_dai': sound/soc/generic/simple-card-utils.c:284:13: error: 'info.port' may be used uninitialized in this function [-Werror=maybe-uninitialized] It's probably best to check the return code anyway, and that also takes care of the warning. Fixes: b6f3fc005a2c ("ASoC: simple-card-utils: fixup asoc_simple_card_get_dai_id() counting") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/generic/simple-card-utils.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 6a31d07976b9..17d8aee43835 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -280,7 +280,10 @@ static int asoc_simple_card_get_dai_id(struct device_node *ep)
* Non HDMI sound case, counting port/endpoint on its DT
* is enough. Let's count it.
*/
- of_graph_parse_endpoint(ep, &info);
+ ret = of_graph_parse_endpoint(ep, &info);
+ if (ret)
+ return -ENXIO;
+
return info.port;
}