diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-08 13:14:05 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-10 11:56:42 +0100 |
| commit | 88a60e552f114ae34796604575239fb196658067 (patch) | |
| tree | 6c00c2cee836d509b7b843db97d33b2645b3b718 /sound | |
| parent | 0dd4fc3c2f663b9124855daf3fd841d70b4dbeea (diff) | |
| download | op-kernel-dev-88a60e552f114ae34796604575239fb196658067.zip op-kernel-dev-88a60e552f114ae34796604575239fb196658067.tar.gz | |
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().
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/generic/simple-card.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index f79347c..106fdad 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -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); } |
