Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fd23436 authored by Andi Kleen's avatar Andi Kleen
Browse files

Merge branches 'smbus' and 'fujitsu-fix' into release-2.6.27

parents 54cd3148 266feefe d8196a93

drivers/acpi/sbshc.c

+7 −0
Original line number Diff line number Diff line
@@ -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;

}

drivers/misc/fujitsu-laptop.c

+7 −0
Original line number Diff line number Diff line
@@ -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},

	{}

};