From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Mon, 12 Dec 2011 03:02:09 +0000 (-0800)
Subject: sh: clkfwk: sh_clk_init_parent() should be called after clk_register()
X-Git-Tag: firefly_0821_release~3680^2~3743^2~7^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7784f4da1a1b8b2519e008551fc4f69713451f89;p=firefly-linux-kernel-4.4.55.git

sh: clkfwk: sh_clk_init_parent() should be called after clk_register()

sh_clk_init_parent() are using clk->mapped_reg
which is mapped in clk_register()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c
index a0d8faa40baa..45fee368b092 100644
--- a/drivers/sh/clk/cpg.c
+++ b/drivers/sh/clk/cpg.c
@@ -222,11 +222,11 @@ static int __init sh_clk_div6_register_ops(struct clk *clks, int nr,
 		clkp->ops = ops;
 		clkp->freq_table = freq_table + (k * freq_table_size);
 		clkp->freq_table[nr_divs].frequency = CPUFREQ_TABLE_END;
-		ret = sh_clk_init_parent(clkp);
+		ret = clk_register(clkp);
 		if (ret < 0)
 			break;
 
-		ret = clk_register(clkp);
+		ret = sh_clk_init_parent(clkp);
 	}
 
 	return ret;