---

yaml --- r: 272592 b: refs/heads/master c: dca2d0e h: refs/heads/master v: v3
git-mirror · Sep 16, 2011 · 9a6a07c · 9a6a07c
1 parent ec76b46
commit 9a6a07c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)