summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorAnisse Astier <anisse@astier.eu>2012-09-19 20:10:48 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-09-19 23:55:50 +0200
commit8669cf6793bb38307a30fb6b9565ddc8840ebd3f (patch)
treecf4d01113e1dc217613c9b08efaff141a78b0c93 /drivers/input
parentRevert "input: ab8500-ponkey: Create AB8500 domain IRQ mapping" (diff)
downloadlinux-8669cf6793bb38307a30fb6b9565ddc8840ebd3f.tar.xz
linux-8669cf6793bb38307a30fb6b9565ddc8840ebd3f.zip
Input: i8042 - disable mux on Toshiba C850D
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> Cc: stable@kernel.org Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
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 6918773ce024..d6cc77a53c7e 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"),
},