From a5215277186ed44956193cc2dcb098e612116177 Mon Sep 17 00:00:00 2001
From: Zhao Yakui <yakui.zhao@intel.com>
Date: Mon, 11 Aug 2008 10:33:31 +0800
Subject: [PATCH] --- yaml --- r: 108500 b: refs/heads/master c:
 9d699ed92a459cb408e2577e8bbeabc8ec3989e1 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/acpi/ec.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ae19bef878b3..f918134e61f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2500822bf4eb0179ef80e5b072c1e0fa83037381
+refs/heads/master: 9d699ed92a459cb408e2577e8bbeabc8ec3989e1
diff --git a/trunk/drivers/acpi/ec.c b/trunk/drivers/acpi/ec.c
index 76784ae7e6a1..13593f9f2197 100644
--- a/trunk/drivers/acpi/ec.c
+++ b/trunk/drivers/acpi/ec.c
@@ -221,6 +221,8 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
 				return 0;
 			msleep(1);
 		}
+		if (acpi_ec_check_status(ec,event))
+			return 0;
 	}
 	pr_err(PREFIX "acpi_ec_wait timeout, status = 0x%2.2x, event = %s\n",
 		acpi_ec_read_status(ec),