From efa54ba69c190bdf28f0cdd942aa7e76705528a4 Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Wed, 28 Jan 2009 12:08:46 -0700
Subject: [PATCH] --- yaml --- r: 137340 b: refs/heads/master c:
 416db864c18343c6dcc5e9768c902460c8f8777c h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/arch/arm/mach-omap2/clock34xx.c | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 7b75c4fd957b..e829227bd40d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95f538ac370d9625457ba00ef7c3bb91e2b92f89
+refs/heads/master: 416db864c18343c6dcc5e9768c902460c8f8777c
diff --git a/trunk/arch/arm/mach-omap2/clock34xx.c b/trunk/arch/arm/mach-omap2/clock34xx.c
index aad77e0d43c7..3d756babb2f4 100644
--- a/trunk/arch/arm/mach-omap2/clock34xx.c
+++ b/trunk/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;
 }