Commit 88a60e55 authored Sep 08, 2014 by Arnd Bergmann Committed by Mark Brown Sep 10, 2014

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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 0dd4fc3c

sound/soc/generic/simple-card.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -116,7 +116,6 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
		int *args_count)
		{
		struct of_phandle_args args;
		struct device_node *node;
		struct clk *clk;
		u32 val;
		int ret;
		@@ -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)) {
		dai->sysclk = val;
		} else {
		clk = of_clk_get(node, 0);
		clk = of_clk_get(args.np, 0);
		if (!IS_ERR(clk))
		dai->sysclk = clk_get_rate(clk);
		}