| commit | 4414d38a8845b229a8e7ea0105fe1bb263b65993 | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Tue Jan 10 13:31:09 2012 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Tue Jan 10 13:31:09 2012 +0900 |
| tree | a0a64a3af9db24acc70ee564b17854c9c6a0e552 | |
| parent | 7afb4e9a92e42e66124b7043405bbca82680aa96 [diff] | |
| parent | 7784f4da1a1b8b2519e008551fc4f69713451f89 [diff] |
Merge branch 'common/clkfwk' into sh-latest
diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c index a0d8faa..45fee36 100644 --- a/drivers/sh/clk/cpg.c +++ b/drivers/sh/clk/cpg.c
@@ -222,11 +222,11 @@ 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;