diff options
| author | Anisse Astier <anisse@astier.eu> | 2012-09-19 11:10:48 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 09:47:27 -0700 |
| commit | 31a4eee5e38205ba0b3c47d3e46c29d046cba89d (patch) | |
| tree | d2597e9ec9943201f6d98740d80ba291eecd5bc6 /drivers/input | |
| parent | b0869211839131f4ebe41c92f6300e1e40c77d57 (diff) | |
| download | kernel_samsung_smdk4412-31a4eee5e38205ba0b3c47d3e46c29d046cba89d.zip kernel_samsung_smdk4412-31a4eee5e38205ba0b3c47d3e46c29d046cba89d.tar.gz kernel_samsung_smdk4412-31a4eee5e38205ba0b3c47d3e46c29d046cba89d.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 15f53c5..e01fd4c 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"), }, |