1 files changed, 5 insertions, 10 deletions

diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index aad77e0d43c7..3d756babb2f4 100644
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -398,19 +398,14 @@ static int _omap3_noncore_dpll_lock(struct clk *clk)
 
         ai = omap3_dpll_autoidle_read(clk);
 
+        omap3_dpll_deny_idle(clk);
+
         _omap3_dpll_write_clken(clk, DPLL_LOCKED);
 
-        if (ai) {
-                /*
-                 * If no downstream clocks are enabled, CM_IDLEST bit
-                 * may never become active, so don't wait for DPLL to lock.
-                 */
-                r = 0;
+        r = _omap3_wait_dpll_status(clk, 1);
+
+        if (ai)
                 omap3_dpll_allow_idle(clk);
-        } else {
-                r = _omap3_wait_dpll_status(clk, 1);
-                omap3_dpll_deny_idle(clk);
-        };
 
         return r;
 }