From 9a6a07c0cc29115921ac8125e744611028fa01d6 Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@ti.com>
Date: Tue, 13 Sep 2011 11:18:44 -0700
Subject: [PATCH] --- yaml --- r: 272592 b: refs/heads/master c:
 dca2d0eb5917ff132d9be13f0afa9ae5d4e80580 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ea8022b92e9e..3419146dbac3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9a5190aa30d9d9eeead10a978609f46869bfe50
+refs/heads/master: dca2d0eb5917ff132d9be13f0afa9ae5d4e80580
diff --git a/trunk/arch/arm/mach-omap2/pm34xx.c b/trunk/arch/arm/mach-omap2/pm34xx.c
index 7255d9bce868..c8cbd00a41af 100644
--- a/trunk/arch/arm/mach-omap2/pm34xx.c
+++ b/trunk/arch/arm/mach-omap2/pm34xx.c
@@ -55,7 +55,7 @@
 static suspend_state_t suspend_state = PM_SUSPEND_ON;
 static inline bool is_suspending(void)
 {
-	return (suspend_state != PM_SUSPEND_ON);
+	return (suspend_state != PM_SUSPEND_ON) && console_suspend_enabled;
 }
 #else
 static inline bool is_suspending(void)