summaryrefslogtreecommitdiffstats
path: root/drivers/sh
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2011-12-11 19:02:09 -0800
committerPaul Mundt <lethal@linux-sh.org>2012-01-10 13:30:30 +0900
commit7784f4da1a1b8b2519e008551fc4f69713451f89 (patch)
treeed208fa21c9f15f3f629b0acb7a5aa21563b832b /drivers/sh
parent2dacb97d9269e303ed761937a0e9db8711515e08 (diff)
downloadlinux-7784f4da1a1b8b2519e008551fc4f69713451f89.tar.bz2
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>
Diffstat (limited to 'drivers/sh')
-rw-r--r--drivers/sh/clk/cpg.c4
1 files changed, 2 insertions, 2 deletions
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;