From b589b180bb79f5aa97e99dbe42f6948061aa64f3 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Apr 2012 21:38:51 -0700
Subject: [PATCH] --- yaml --- r: 298666 b: refs/heads/master c:
 43e347a1c451ff61ac16cc0e88ea9f48bbc6351d h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/char/apm-emulation.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 28b500090a92..df00727842c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35fe2e73bf097409abb9b81e041db83ea08b1c93
+refs/heads/master: 43e347a1c451ff61ac16cc0e88ea9f48bbc6351d
diff --git a/trunk/drivers/char/apm-emulation.c b/trunk/drivers/char/apm-emulation.c
index 57501ca9204b..46118f845948 100644
--- a/trunk/drivers/char/apm-emulation.c
+++ b/trunk/drivers/char/apm-emulation.c
@@ -301,7 +301,7 @@ apm_ioctl(struct file *filp, u_int cmd, u_long arg)
 			 * anything critical, chill a bit on each iteration.
 			 */
 			while (wait_event_freezable(apm_suspend_waitqueue,
-					as->suspend_state == SUSPEND_DONE))
+					as->suspend_state != SUSPEND_ACKED))
 				msleep(10);
 			break;
 		case SUSPEND_ACKTO: