diff options
| author |   Magnus Damm <damm@igel.co.jp> | 2008-10-31 20:13:32 +0900 |
|---|---|---|
| committer |   Paul Mundt <lethal@linux-sh.org> | 2008-12-22 18:42:50 +0900 |
| commit | d12cfac146d2b512496bf974b83ee1210032065f (patch) | |
| tree | a46c31fc18fbfcfb78d3fb0643409b0865a313d0 /arch/sh/kernel/cpu | |
| parent | sh: Move arch_get_unmapped_area() in to arch/sh/mm/mmap.c. (diff) | |
| download | linux-dev-d12cfac146d2b512496bf974b83ee1210032065f.tar.xz linux-dev-d12cfac146d2b512496bf974b83ee1210032065f.zip | |
sh: enable and disable clocks recursively
Recurse and make sure parent clocks get enabled/disabled.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu')
| -rw-r--r-- | arch/sh/kernel/cpu/clock.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c index b7e46d5bba43..717056b3d400 100644 --- a/arch/sh/kernel/cpu/clock.c +++ b/arch/sh/kernel/cpu/clock.c @@ -117,6 +117,11 @@ int clk_enable(struct clk *clk) unsigned long flags; int ret; + if (!clk) + return -EINVAL; + + clk_enable(clk->parent); + spin_lock_irqsave(&clock_lock, flags); ret = __clk_enable(clk); spin_unlock_irqrestore(&clock_lock, flags); @@ -147,9 +152,14 @@ void clk_disable(struct clk *clk) { unsigned long flags; + if (!clk) + return -EINVAL; + spin_lock_irqsave(&clock_lock, flags); __clk_disable(clk); spin_unlock_irqrestore(&clock_lock, flags); + + clk_disable(clk->parent); } EXPORT_SYMBOL_GPL(clk_disable); |