projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
[cascardo/linux.git]
/
drivers
/
sh
/
clk
/
cpg.c
diff --git
a/drivers/sh/clk/cpg.c
b/drivers/sh/clk/cpg.c
index
45fee36
..
92d314a
100644
(file)
--- 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)
return -EINVAL;
}
- clk
->parent = clk->parent_table[val]
;
+ clk
_reparent(clk, clk->parent_table[val])
;
if (!clk->parent) {
pr_err("sh_clk_init_parent: unable to set parent");
return -EINVAL;