---

yaml --- r: 216995 b: refs/heads/master c: 503923e h: refs/heads/master i: 216993: 692965b 216991: 8ca13eb v: v3
git-mirror · Oct 8, 2010 · 5420bf6 · 5420bf6
1 parent 0a2ffea
commit 5420bf6
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: cc7a1d2a540a780066aa562c651a88dd28b6fc8a
+refs/heads/master: 503923eeecb93ff69ee940549f314e0fe3a68429
diff --git a/trunk/arch/arm/mach-omap2/pm24xx.c b/trunk/arch/arm/mach-omap2/pm24xx.c
@@ -245,6 +245,8 @@ static int omap2_can_sleep(void)
 {
 	if (omap2_fclks_active())
 		return 0;
+	if (!omap_uart_can_sleep())
+		return 0;
 	if (osc_ck->usecount > 1)
 		return 0;
 	if (omap_dma_running())