| Message ID | 20170906042935.23586-3-aaron.ma@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/1,SRU,Xenial/Zesty] Input: trackpoint - assume 3 buttons when buttons detection fails | expand |
On Wed, Sep 06, 2017 at 12:29:35PM +0800, Aaron Ma wrote: > From: Oscar Campos <oscar.campos@member.fsf.org> > > BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1715271 > > 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> > (backported from commit 293b915fd9bebf33cdc906516fb28d54649a25ac) > Signed-off-by: Aaron Ma <aaron.ma@canonical.com> Simple patch, backport from upstream looks good. Acked-by: Seth Forshee <seth.forshee@canonical.com>
On 06.09.2017 06:29, Aaron Ma wrote: > From: Oscar Campos <oscar.campos@member.fsf.org> > > BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1715271 > > 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> > (backported from commit 293b915fd9bebf33cdc906516fb28d54649a25ac) > Signed-off-by: Aaron Ma <aaron.ma@canonical.com> > --- > drivers/input/mouse/trackpoint.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c > index 354d47ecd66a..83a919f9cd4e 100644 > --- a/drivers/input/mouse/trackpoint.c > +++ b/drivers/input/mouse/trackpoint.c > @@ -380,8 +380,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); > Applied to Xenial and Zesty master-next
diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c index 354d47ecd66a..83a919f9cd4e 100644 --- a/drivers/input/mouse/trackpoint.c +++ b/drivers/input/mouse/trackpoint.c @@ -380,8 +380,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);