From: Yu Luming <luming.yu@intel.com>
Date: Sat, 31 Dec 2005 06:45:00 +0000 (-0500)
Subject: [ACPI] fix acpi_os_wait_sempahore() finite timeout case (AE_TIME warning)
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dacd9b80355525be0e3c519687868410e304ad1c;p=mv-sheeva.git

[ACPI] fix acpi_os_wait_sempahore() finite timeout case (AE_TIME warning)

Before this fix, the finite timeout case
behaved like the no-timeout (trylock) case.

http://bugzilla.kernel.org/show_bug.cgi?id=4588

Signed-off-by: Luming Yu <luming.yu@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index e3cd0b16031..8653dac01a7 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -836,7 +836,7 @@ acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout)
 			static const int quantum_ms = 1000 / HZ;
 
 			ret = down_trylock(sem);
-			for (i = timeout; (i > 0 && ret < 0); i -= quantum_ms) {
+			for (i = timeout; (i > 0 && ret != 0); i -= quantum_ms) {
 				schedule_timeout_interruptible(1);
 				ret = down_trylock(sem);
 			}