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

Merge branch 'sh/clkfwk' into sh-latest

Browse Source
This commit is contained in:
Paul Mundt
2012-01-24 10:45:43 +09:00
parent 66dae316dd 64dea57588
commit 75ed4da481
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,7 +190,7 @@ static int __init sh_clk_init_parent(struct clk *clk)
return -EINVAL; return -EINVAL;
} }
clk->parent = clk->parent_table[val]; clk_reparent(clk, clk->parent_table[val]);
if (!clk->parent) { if (!clk->parent) {
pr_err("sh_clk_init_parent: unable to set parent"); pr_err("sh_clk_init_parent: unable to set parent");
return -EINVAL; return -EINVAL;