From 711f64f3ea06369c65db7fe48ca9fa5e88cfe7db Mon Sep 17 00:00:00 2001
From: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
Date: Fri, 29 Aug 2008 11:06:21 +0930
Subject: [PATCH] --- yaml --- r: 109495 b: refs/heads/master c:
 d8196a93b1ce9a5abb410f39f9375912c9e53675 h: refs/heads/master i:   109493:
 892051671f56374bbba7821138da6864ae4be00e   109491:
 43367909b6663923d57dcc86c8f47f35144e7be7   109487:
 d182dfc914baca262e2f12b71978a44af80580b1 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/acpi/sbshc.c          | 7 -------
 trunk/drivers/misc/fujitsu-laptop.c | 7 +++++++
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 4c6807016efa..a02de9192015 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 266feefeb9ea2d846ac82eb6db1a54b230364ba4
+refs/heads/master: d8196a93b1ce9a5abb410f39f9375912c9e53675
diff --git a/trunk/drivers/acpi/sbshc.c b/trunk/drivers/acpi/sbshc.c
index a4e3767b8c64..bcf2c70fca87 100644
--- a/trunk/drivers/acpi/sbshc.c
+++ b/trunk/drivers/acpi/sbshc.c
@@ -107,13 +107,6 @@ 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;
 }
diff --git a/trunk/drivers/misc/fujitsu-laptop.c b/trunk/drivers/misc/fujitsu-laptop.c
index 7a1ef6c262de..3e56203e4947 100644
--- a/trunk/drivers/misc/fujitsu-laptop.c
+++ b/trunk/drivers/misc/fujitsu-laptop.c
@@ -463,6 +463,13 @@ static struct dmi_system_id __initdata fujitsu_dmi_table[] = {
 		     DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK S6410"),
 		     },
 	 .callback = dmi_check_cb_s6410},
+	{
+	 .ident = "FUJITSU LifeBook P8010",
+	 .matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+		     DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook P8010"),
+		    },
+	 .callback = dmi_check_cb_s6410},
 	{}
 };