summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/sbshc.c
diff options
context:
space:
mode:
authorZhao Yakui <yakui.zhao@intel.com>2008-08-26 13:57:34 +0800
committerAndi Kleen <ak@linux.intel.com>2008-09-04 14:32:28 +0200
commit266feefeb9ea2d846ac82eb6db1a54b230364ba4 (patch)
tree300ccf4c33715e7a792c086262f717b0555f98c3 /drivers/acpi/sbshc.c
parentb635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff)
downloadop-kernel-dev-266feefeb9ea2d846ac82eb6db1a54b230364ba4.zip
op-kernel-dev-266feefeb9ea2d846ac82eb6db1a54b230364ba4.tar.gz
ACPI: Avoid bogus timeout about SMbus check
In the function of wait_transaction_complete when the timeout happens, OS will try to check the status of SMbus again. If the status is what OS expected, it will be regarded as the bogus timeout. Otherwise it will be treated as ETIME. http://bugzilla.kernel.org/show_bug.cgi?id=10483 Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> tested-by : Oldřich Jedlička < <oldium.pro@seznam.cz> Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'drivers/acpi/sbshc.c')
-rw-r--r--drivers/acpi/sbshc.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index bcf2c70..a4e3767 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -107,6 +107,13 @@ static int wait_transaction_complete(struct acpi_smb_hc *hc, int timeout)
if (wait_event_timeout(hc->wait, smb_check_done(hc),
msecs_to_jiffies(timeout)))
return 0;
+ /*
+ * After the timeout happens, OS will try to check the status of SMbus.
+ * If the status is what OS expected, it will be regarded as the bogus
+ * timeout.
+ */
+ if (smb_check_done(hc))
+ return 0;
else
return -ETIME;
}
OpenPOWER on IntegriCloud