ASoC: simple-card-utils: fix build warning without CONFIG_OF
authorArnd Bergmann <arnd@arndb.de>
Mon, 10 Dec 2018 20:46:10 +0000 (21:46 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 11 Dec 2018 01:08:51 +0000 (01:08 +0000)
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>
sound/soc/generic/simple-card-utils.c

index 6a31d07976b95725303a782f400861d60313ab55..17d8aee4383553dd15841aea53242b1105761611 100644 (file)
@@ -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;
 }