ASoC: simple-card-utils: fix build warning without CONFIG_OF
PATCH 1/1 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.
--- sound/soc/generic/simple-card-utils.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/generic/simple-card-utils.c +4 -1
@@ -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; }
Signature · 1 line
2.20.0
Hi
Quoted 6 lines
When
CONFIG_OFis 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]
Quoted 6 lines
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 <[email protected]>---
Mark Brown
maintainerApplied "ASoC: simple-card-utils: fix build warning without CONFIG_OF" to the asoc tree
In reply to Arnd BergmannThe patch
ASoC: simple-card-utils: fix build warning without CONFIG_OF
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
2b320e046495e6cf02d1f0b1abf07042ac5635eaMon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Mon, 10 Dec 2018 21:46:10 +0100
Subject: [PATCH] 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.
--- sound/soc/generic/simple-card-utils.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/generic/simple-card-utils.c +4 -1
@@ -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; }
Signature · 1 line
2.19.0.rc2