summaryrefslogtreecommitdiffstats
path: root/drivers/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-01-10 13:31:09 +0900
committerPaul Mundt <lethal@linux-sh.org>2012-01-10 13:31:09 +0900
commit4414d38a8845b229a8e7ea0105fe1bb263b65993 (patch)
treea0a64a3af9db24acc70ee564b17854c9c6a0e552 /drivers/sh
parent7afb4e9a92e42e66124b7043405bbca82680aa96 (diff)
parent7784f4da1a1b8b2519e008551fc4f69713451f89 (diff)
downloadlinux-4414d38a8845b229a8e7ea0105fe1bb263b65993.tar.gz
linux-4414d38a8845b229a8e7ea0105fe1bb263b65993.tar.bz2
linux-4414d38a8845b229a8e7ea0105fe1bb263b65993.zip
Merge branch 'common/clkfwk' into sh-latest
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;