Merge tag 'for_3.7-fixes-cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / arch / arm / mach-omap2 / pm.c

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 173c2be14d5d0d748f28c6db40bc8f53e88d189b..fbe31313d7eb5ae8140db95d099cbe2a17bc1c0b 100644 (file)
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -81,7 +81,8 @@ static void __init omap2_init_processor_devices(void)
 
 int __init omap_pm_clkdms_setup(struct clockdomain *clkdm, void *unused)
 {
-       if (clkdm->flags & CLKDM_CAN_ENABLE_AUTO)
+       if ((clkdm->flags & CLKDM_CAN_ENABLE_AUTO) &&
+           !(clkdm->flags & CLKDM_MISSING_IDLE_REPORTING))
                clkdm_allow_idle(clkdm);
        else if (clkdm->flags & CLKDM_CAN_FORCE_SLEEP &&
                 atomic_read(&clkdm->usecount) == 0)
@@ -197,7 +198,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name,
                goto exit;
        }
 
-       freq = clk->rate;
+       freq = clk_get_rate(clk);
        clk_put(clk);
 
        rcu_read_lock();