ASoC: simple-card: fix regression in clock rate lookup
PATCH 1/1 ASoC: simple-card: fix regression in clock rate lookup
Commit 7c7b9cf53d284f ("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().
sound/soc/generic/simple-card.c +1 -2
@@ -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); }
Mark Brown
maintainerQuoted 5 lines · Arnd Bergmann
Commit
7c7b9cf53d284f("ASoC: simple-card: fixupcpu_dai_nameclear 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:
Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140910/5368762a/attachment-0001.sig>