| From 420dadd1d49dc0e4a8d32543cc5c5495205350e8 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Thu, 30 Mar 2017 01:49:06 +0000 |
| Subject: [PATCH 094/286] ASoC: rcar: fixup of_clk_add_provider() usage for |
| multi clkout |
| |
| Current adg is calling of_clk_add_povider() multiple times, |
| but it is not correct usage. This patch fixup its parameter |
| and call it once. |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| (cherry picked from commit d7f298197a22f11b38059f257842dac7c30a564c) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/adg.c | 14 ++++++-------- |
| 1 file changed, 6 insertions(+), 8 deletions(-) |
| |
| diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c |
| index 54146f66538c..33378618deeb 100644 |
| --- a/sound/soc/sh/rcar/adg.c |
| +++ b/sound/soc/sh/rcar/adg.c |
| @@ -537,16 +537,14 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, |
| clk = clk_register_fixed_rate(dev, clkout_name[i], |
| parent_clk_name, 0, |
| req_rate); |
| - if (!IS_ERR(clk)) { |
| - adg->onecell.clks = adg->clkout; |
| - adg->onecell.clk_num = CLKOUTMAX; |
| - |
| + adg->clkout[i] = ERR_PTR(-ENOENT); |
| + if (!IS_ERR(clk)) |
| adg->clkout[i] = clk; |
| - |
| - of_clk_add_provider(np, of_clk_src_onecell_get, |
| - &adg->onecell); |
| - } |
| } |
| + adg->onecell.clks = adg->clkout; |
| + adg->onecell.clk_num = CLKOUTMAX; |
| + of_clk_add_provider(np, of_clk_src_onecell_get, |
| + &adg->onecell); |
| } |
| |
| adg->ckr = ckr; |
| -- |
| 2.13.3 |
| |
