diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-01-23 20:45:43 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-23 20:45:43 -0500 |
commit | 75ed4da4810d8f8f95aefa62242926ed31862fe8 (patch) | |
tree | a97de63ae93490e9d9587a517ef204640b9f5d2c /drivers | |
parent | 66dae316dd2941cad098e6674810fdc3f4b2e275 (diff) | |
parent | 64dea57588f49736c2a7778292f3967c7984ab94 (diff) |
Merge branch 'sh/clkfwk' into sh-latest
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/sh/clk/cpg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c index 45fee368b092..92d314a73f69 100644 --- a/drivers/sh/clk/cpg.c +++ b/drivers/sh/clk/cpg.c | |||
@@ -190,7 +190,7 @@ static int __init sh_clk_init_parent(struct clk *clk) | |||
190 | return -EINVAL; | 190 | return -EINVAL; |
191 | } | 191 | } |
192 | 192 | ||
193 | clk->parent = clk->parent_table[val]; | 193 | clk_reparent(clk, clk->parent_table[val]); |
194 | if (!clk->parent) { | 194 | if (!clk->parent) { |
195 | pr_err("sh_clk_init_parent: unable to set parent"); | 195 | pr_err("sh_clk_init_parent: unable to set parent"); |
196 | return -EINVAL; | 196 | return -EINVAL; |