summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDennis Wassenberg <dennis.wassenberg@secunet.com>2018-03-08 15:32:09 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-04-08 14:26:33 +0200
commit4043155add4041cc1da285c8cbaafe8f9a23098a (patch)
tree4691d51919a2971821e81af58de66dd99e06d2ba
parentac72f0080c1a6bf28b21ca1b43093d61acd14a57 (diff)
downloadlinux-stable-4043155add4041cc1da285c8cbaafe8f9a23098a.tar.gz
linux-stable-4043155add4041cc1da285c8cbaafe8f9a23098a.tar.bz2
linux-stable-4043155add4041cc1da285c8cbaafe8f9a23098a.zip
Input: i8042 - add Lenovo ThinkPad L460 to i8042 reset list
commit b56af54ac78c54a519d82813836f305d7f76ef27 upstream. Reset i8042 before probing because of insufficient BIOS initialisation of the i8042 serial controller. This makes Synaptics touchpad detection possible. Without resetting the Synaptics touchpad is not detected because there are always NACK messages from AUX port. Signed-off-by: Dennis Wassenberg <dennis.wassenberg@secunet.com> Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/input/serio/i8042-x86ia64io.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 6cbbdc6e9687..6ca00f9ef224 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -621,6 +621,13 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
},
},
{
+ /* Lenovo ThinkPad L460 */
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L460"),
+ },
+ },
+ {
/* Clevo P650RS, 650RP6, Sager NP8152-S, and others */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),