aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorAnisse Astier <anisse@astier.eu>2012-09-19 11:10:48 -0700
committerBen Hutchings <ben@decadent.org.uk>2012-10-10 03:31:00 +0100
commitb0162ce56654616f0c5cdb48b06e448c2ee400cc (patch)
tree64436a9fb2811ded445f8667652ee7eea659de14 /drivers/input
parent75c747ece9b2a227d21a7d83ad522b5da75b961b (diff)
downloadkernel_samsung_smdk4412-b0162ce56654616f0c5cdb48b06e448c2ee400cc.zip
kernel_samsung_smdk4412-b0162ce56654616f0c5cdb48b06e448c2ee400cc.tar.gz
kernel_samsung_smdk4412-b0162ce56654616f0c5cdb48b06e448c2ee400cc.tar.bz2
Input: i8042 - disable mux on Toshiba C850D
commit 8669cf6793bb38307a30fb6b9565ddc8840ebd3f upstream. On Toshiba Satellite C850D, the touchpad and the keyboard might randomly not work at boot. Preventing MUX mode activation solves this issue. Signed-off-by: Anisse Astier <anisse@astier.eu> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/serio/i8042-x86ia64io.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index d4ec371..cd1a843 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -335,6 +335,12 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = {
},
{
.matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE C850D"),
+ },
+ },
+ {
+ .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ALIENWARE"),
DMI_MATCH(DMI_PRODUCT_NAME, "Sentia"),
},