---

yaml --- r: 355612 b: refs/heads/master c: 53e1cb4 h: refs/heads/master v: v3
git-mirror · Jan 29, 2013 · 85abaf9 · 85abaf9
1 parent d0dfb30
commit 85abaf9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c165a14023ecec8a68f3b87d0c3c822426065937
+refs/heads/master: 53e1cb469e6cf353aa581e6b0a36cca359ecee25
diff --git a/trunk/arch/arm/mach-omap2/clockdomain.c b/trunk/arch/arm/mach-omap2/clockdomain.c
@@ -764,6 +764,7 @@ int clkdm_sleep(struct clockdomain *clkdm)
 	spin_lock_irqsave(&clkdm->lock, flags);
 	clkdm->_flags &= ~_CLKDM_FLAG_HWSUP_ENABLED;
 	ret = arch_clkdm->clkdm_sleep(clkdm);
+	ret |= pwrdm_state_switch(clkdm->pwrdm.ptr);
 	spin_unlock_irqrestore(&clkdm->lock, flags);
 	return ret;
 }