---

yaml --- r: 137331 b: refs/heads/master c: 054ce50 h: refs/heads/master i: 137329: a4df88d 137327: 7895cd7 v: v3
git-mirror · Feb 8, 2009 · ce2ec4d · ce2ec4d
1 parent c80ff27
commit ce2ec4d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     	else
     		omap2_clkdm_wakeup(clkdm);
+    	pwrdm_wait_transition(clkdm->pwrdm.ptr);
     	return 0;
     }
@@ Expand Down @@