diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-07 19:07:10 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-07 19:07:10 +0000 |
commit | 1f63b9546a8c7b90de2d9e52cf8ff07f9f653d94 (patch) | |
tree | 6bd4915b4289ef32c94ecd523f38bb13ca032e4a /arch/arm/mach-mxs/clock.c | |
parent | 4a683a2c5e7cabe91218db28e56dc25e1b134ce3 (diff) | |
parent | d8cff1365ec568149d57aeed8279d745591d0fa1 (diff) |
Merge branch 'fixes'
Diffstat (limited to 'arch/arm/mach-mxs/clock.c')
-rw-r--r-- | arch/arm/mach-mxs/clock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/clock.c b/arch/arm/mach-mxs/clock.c index e7d2269cf70e..a7093c88e6a6 100644 --- a/arch/arm/mach-mxs/clock.c +++ b/arch/arm/mach-mxs/clock.c @@ -57,7 +57,6 @@ static void __clk_disable(struct clk *clk) if (clk->disable) clk->disable(clk); __clk_disable(clk->parent); - __clk_disable(clk->secondary); } } @@ -68,7 +67,6 @@ static int __clk_enable(struct clk *clk) if (clk->usecount++ == 0) { __clk_enable(clk->parent); - __clk_enable(clk->secondary); if (clk->enable) clk->enable(clk); |