Merge branch 'common/clkfwk' into sh-latest

4414d38a · Paul Mundt · 7afb4e9a · 7784f4da · 4414d38a
Commit 4414d38a authored Jan 10, 2012 by Paul Mundt
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/sh/clk/cpg.c drivers/sh/clk/cpg.c +2 -2

No files found.
--- 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;