lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'common/clkfwk' into sh-latest

Browse Source
This commit is contained in:
Paul Mundt
2012-01-10 13:31:09 +09:00
parent 7afb4e9a92 7784f4da1a
commit 4414d38a88
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/sh/clk/cpg.c
View File

@@ -222,11 +222,11 @@ static int __init sh_clk_div6_register_ops(struct clk *clks, int nr,
clkp->ops = ops; clkp->ops = ops;
clkp->freq_table = freq_table + (k * freq_table_size); clkp->freq_table = freq_table + (k * freq_table_size);
clkp->freq_table[nr_divs].frequency = CPUFREQ_TABLE_END; clkp->freq_table[nr_divs].frequency = CPUFREQ_TABLE_END;
ret = sh_clk_init_parent(clkp); ret = clk_register(clkp);
if (ret < 0) if (ret < 0)
break; break;
ret = clk_register(clkp); ret = sh_clk_init_parent(clkp);
} }
return ret; return ret;