summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOscar Campos <oscar.campos@member.fsf.org>2017-07-18 17:20:36 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-09-09 17:39:39 +0200
commited7a384a904f1d5031b4d10173ef32ab405333a1 (patch)
tree34daa75f500b07632213aee2497d5517e53e2d67
parent90a1e2e19ed731d66f95f5471c99d0e16a92021d (diff)
downloadlinux-stable-ed7a384a904f1d5031b4d10173ef32ab405333a1.tar.gz
linux-stable-ed7a384a904f1d5031b4d10173ef32ab405333a1.tar.bz2
linux-stable-ed7a384a904f1d5031b4d10173ef32ab405333a1.zip
Input: trackpoint - assume 3 buttons when buttons detection fails
commit 293b915fd9bebf33cdc906516fb28d54649a25ac upstream. Trackpoint buttons detection fails on ThinkPad 570 and 470 series, this makes the middle button of the trackpoint to not being recogized. As I don't believe there is any trackpoint with less than 3 buttons this patch just assumes three buttons when the extended button information read fails. Signed-off-by: Oscar Campos <oscar.campos@member.fsf.org> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Aaron Ma <aaron.ma@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/input/mouse/trackpoint.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
index ce6ff9b301bb..7e2dc5e56632 100644
--- a/drivers/input/mouse/trackpoint.c
+++ b/drivers/input/mouse/trackpoint.c
@@ -381,8 +381,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
return 0;
if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) {
- psmouse_warn(psmouse, "failed to get extended button data\n");
- button_info = 0;
+ psmouse_warn(psmouse, "failed to get extended button data, assuming 3 buttons\n");
+ button_info = 0x33;
}
psmouse->private = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL);