diff options
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
-rw-r--r-- | arch/arm/mach-omap2/pm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 939bd6f70b51..abefbc4d8e0b 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c | |||
@@ -80,7 +80,8 @@ static void __init omap2_init_processor_devices(void) | |||
80 | 80 | ||
81 | int __init omap_pm_clkdms_setup(struct clockdomain *clkdm, void *unused) | 81 | int __init omap_pm_clkdms_setup(struct clockdomain *clkdm, void *unused) |
82 | { | 82 | { |
83 | if (clkdm->flags & CLKDM_CAN_ENABLE_AUTO) | 83 | if ((clkdm->flags & CLKDM_CAN_ENABLE_AUTO) && |
84 | !(clkdm->flags & CLKDM_MISSING_IDLE_REPORTING)) | ||
84 | clkdm_allow_idle(clkdm); | 85 | clkdm_allow_idle(clkdm); |
85 | else if (clkdm->flags & CLKDM_CAN_FORCE_SLEEP && | 86 | else if (clkdm->flags & CLKDM_CAN_FORCE_SLEEP && |
86 | atomic_read(&clkdm->usecount) == 0) | 87 | atomic_read(&clkdm->usecount) == 0) |
@@ -188,7 +189,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, | |||
188 | goto exit; | 189 | goto exit; |
189 | } | 190 | } |
190 | 191 | ||
191 | freq = clk->rate; | 192 | freq = clk_get_rate(clk); |
192 | clk_put(clk); | 193 | clk_put(clk); |
193 | 194 | ||
194 | rcu_read_lock(); | 195 | rcu_read_lock(); |