Unverified Commit 2b320e04 authored Dec 10, 2018 by Arnd Bergmann Committed by Mark Brown Dec 11, 2018

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: b6f3fc00 ("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>

parent e9dc9190

sound/soc/generic/simple-card-utils.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message