diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /arch/arm/mach-omap2/clockdomain.c | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'arch/arm/mach-omap2/clockdomain.c')
| -rw-r--r-- | arch/arm/mach-omap2/clockdomain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c index 1a45ed1e8ba..dd285f00146 100644 --- a/arch/arm/mach-omap2/clockdomain.c +++ b/arch/arm/mach-omap2/clockdomain.c | |||
| @@ -559,7 +559,7 @@ int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk) | |||
| 559 | * downstream clocks for debugging purposes? | 559 | * downstream clocks for debugging purposes? |
| 560 | */ | 560 | */ |
| 561 | 561 | ||
| 562 | if (!clkdm || !clk) | 562 | if (!clkdm || !clk || !clkdm->clktrctrl_mask) |
| 563 | return -EINVAL; | 563 | return -EINVAL; |
| 564 | 564 | ||
| 565 | if (atomic_inc_return(&clkdm->usecount) > 1) | 565 | if (atomic_inc_return(&clkdm->usecount) > 1) |
| @@ -610,7 +610,7 @@ int omap2_clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk) | |||
| 610 | * downstream clocks for debugging purposes? | 610 | * downstream clocks for debugging purposes? |
| 611 | */ | 611 | */ |
| 612 | 612 | ||
| 613 | if (!clkdm || !clk) | 613 | if (!clkdm || !clk || !clkdm->clktrctrl_mask) |
| 614 | return -EINVAL; | 614 | return -EINVAL; |
| 615 | 615 | ||
| 616 | #ifdef DEBUG | 616 | #ifdef DEBUG |