From ce2ec4da235d75c983d6873626e9992cb77be6c4 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Tue, 27 Jan 2009 19:44:31 -0700
Subject: [PATCH] --- yaml --- r: 137331 b: refs/heads/master c:
 054ce503ae335dbc8610ef5aa0852c0c090023fe h: refs/heads/master i:   137329:
 a4df88d9a61daff4fb7a51d78c95f0c6dd02ad5c   137327:
 7895cd7e59d2bc2a1dc53039911cf0fdbda97118 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-omap2/clockdomain.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ef82290cf700..35dab8bcd103 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be48ea74d49408c5c4f999c730d35eaf0034f273
+refs/heads/master: 054ce503ae335dbc8610ef5aa0852c0c090023fe
diff --git a/trunk/arch/arm/mach-omap2/clockdomain.c b/trunk/arch/arm/mach-omap2/clockdomain.c
index e9b4f6c564e4..c9c367c39679 100644
--- a/trunk/arch/arm/mach-omap2/clockdomain.c
+++ b/trunk/arch/arm/mach-omap2/clockdomain.c
@@ -568,6 +568,8 @@ int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk)
 	else
 		omap2_clkdm_wakeup(clkdm);
 
+	pwrdm_wait_transition(clkdm->pwrdm.ptr);
+
 	return 0;
 }