Skip to content

Commit c5b8e1d

Browse files
DamnWidgetgregkh
authored andcommitted
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>
1 parent 2c65494 commit c5b8e1d

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/input/mouse/trackpoint.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
381381
return 0;
382382

383383
if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) {
384-
psmouse_warn(psmouse, "failed to get extended button data\n");
385-
button_info = 0;
384+
psmouse_warn(psmouse, "failed to get extended button data, assuming 3 buttons\n");
385+
button_info = 0x33;
386386
}
387387

388388
psmouse->private = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL);

0 commit comments

Comments
 (0)