Commit ed7a384a authored by Oscar Campos's avatar Oscar Campos Committed by Greg Kroah-Hartman

Input: trackpoint - assume 3 buttons when buttons detection fails

commit 293b915f 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: default avatarOscar Campos <oscar.campos@member.fsf.org>
Acked-by: default avatarPeter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarAaron Ma <aaron.ma@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 90a1e2e1
...@@ -381,8 +381,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties) ...@@ -381,8 +381,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
return 0; return 0;
if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) { if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) {
psmouse_warn(psmouse, "failed to get extended button data\n"); psmouse_warn(psmouse, "failed to get extended button data, assuming 3 buttons\n");
button_info = 0; button_info = 0x33;
} }
psmouse->private = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL); psmouse->private = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment