projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e30de6e
)
plat-rk: clock.c clk_set_parent can use default
author
chenxing
<chenxing@rock-chips.com>
Wed, 12 Sep 2012 12:08:29 +0000
(20:08 +0800)
committer
chenxing
<chenxing@rock-chips.com>
Wed, 12 Sep 2012 12:08:29 +0000
(20:08 +0800)
arch/arm/plat-rk/clock.c
patch
|
blob
|
history
diff --git
a/arch/arm/plat-rk/clock.c
b/arch/arm/plat-rk/clock.c
index 42f2c7f9735042ed7f3330283c0d656ddfe89770..fdd4c941bad6463815b2cf16ee6d60fd45d9dd0d 100755
(executable)
--- a/
arch/arm/plat-rk/clock.c
+++ b/
arch/arm/plat-rk/clock.c
@@
-424,7
+424,7
@@
int clk_set_parent(struct clk *clk, struct clk *parent)
if (clk == NULL || IS_ERR(clk) || parent == NULL || IS_ERR(parent))
return ret;
- if (clk->
set_parent==NULL||clk->
parents == NULL)
+ if (clk->parents == NULL)
return ret;
LOCK();
@@
-443,7
+443,7
@@
int clk_set_parent_force(struct clk *clk, struct clk *parent)
if (clk == NULL || IS_ERR(clk) || parent == NULL || IS_ERR(parent))
return ret;
- if (clk->
set_parent==NULL||clk->
parents == NULL)
+ if (clk->parents == NULL)
return ret;
LOCK();
ret = clk_set_parent_nolock(clk, parent);