releases/4.9.49/input-trackpoint-assume-3-buttons-when-buttons-detection-fails.patch

   1 From 293b915fd9bebf33cdc906516fb28d54649a25ac Mon Sep 17 00:00:00 2001
   2 From: Oscar Campos <oscar.campos@member.fsf.org>
   3 Date: Tue, 18 Jul 2017 17:20:36 -0700
   4 Subject: Input: trackpoint - assume 3 buttons when buttons detection fails
   5
   6 From: Oscar Campos <oscar.campos@member.fsf.org>
   7
   8 commit 293b915fd9bebf33cdc906516fb28d54649a25ac upstream.
   9
  10 Trackpoint buttons detection fails on ThinkPad 570 and 470 series,
  11 this makes the middle button of the trackpoint to not being recogized.
  12 As I don't believe there is any trackpoint with less than 3 buttons this
  13 patch just assumes three buttons when the extended button information
  14 read fails.
  15
  16 Signed-off-by: Oscar Campos <oscar.campos@member.fsf.org>
  17 Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
  18 Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  19 Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21 ---
  22  drivers/input/mouse/trackpoint.c |    4 ++--
  23  1 file changed, 2 insertions(+), 2 deletions(-)
  24
  25 --- a/drivers/input/mouse/trackpoint.c
  26 +++ b/drivers/input/mouse/trackpoint.c
  27 @@ -381,8 +381,8 @@ int trackpoint_detect(struct psmouse *ps
  28                 return 0;
  29
  30         if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) {
  31 -               psmouse_warn(psmouse, "failed to get extended button data\n");
  32 -               button_info = 0;
  33 +               psmouse_warn(psmouse, "failed to get extended button data, assuming 3 buttons\n");
  34 +               button_info = 0x33;
  35         }
  36
  37         psmouse->private = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL);