Commit 88a60e55 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown

ASoC: simple-card: fix regression in clock rate lookup

Commit 7c7b9cf5 ("ASoC: simple-card: fixup cpu_dai_name
clear case") changed the way that "sound-dai" properties are handled,
which leads to the clock frequency not being picked up from the
node that the phandle points to, as correctly identified by gcc
with this warning:

sound/soc/generic/simple-card.c: In function 'asoc_simple_card_sub_parse_of':
sound/soc/generic/simple-card.c:165:7: warning: 'node' may be used uninitialized in this function [-Wmaybe-uninitialized]

This restores the previous behavior by using the node from
of_parse_phandle_with_args() that was previously being
returned from of_parse_phandle().
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0dd4fc3c
...@@ -116,7 +116,6 @@ asoc_simple_card_sub_parse_of(struct device_node *np, ...@@ -116,7 +116,6 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
int *args_count) int *args_count)
{ {
struct of_phandle_args args; struct of_phandle_args args;
struct device_node *node;
struct clk *clk; struct clk *clk;
u32 val; u32 val;
int ret; int ret;
...@@ -162,7 +161,7 @@ asoc_simple_card_sub_parse_of(struct device_node *np, ...@@ -162,7 +161,7 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
} else if (!of_property_read_u32(np, "system-clock-frequency", &val)) { } else if (!of_property_read_u32(np, "system-clock-frequency", &val)) {
dai->sysclk = val; dai->sysclk = val;
} else { } else {
clk = of_clk_get(node, 0); clk = of_clk_get(args.np, 0);
if (!IS_ERR(clk)) if (!IS_ERR(clk))
dai->sysclk = clk_get_rate(clk); dai->sysclk = clk_get_rate(clk);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment