| From 47e6fb4212d09f325c0847d05985dd3d71553095 Mon Sep 17 00:00:00 2001 |
| From: Masaki Ota <masaki.ota@jp.alps.com> |
| Date: Fri, 17 Mar 2017 14:19:40 -0700 |
| Subject: [PATCH] Input: ALPS - fix trackstick button handling on V8 devices |
| |
| commit 47e6fb4212d09f325c0847d05985dd3d71553095 upstream. |
| |
| Alps stick devices always have physical buttons, so we should not check |
| ALPS_BUTTONPAD flag to decide whether we should report them. |
| |
| Fixes: 4777ac220c43 ("Input: ALPS - add touchstick support for SS5 hardware") |
| Signed-off-by: Masaki Ota <masaki.ota@jp.alps.com> |
| Acked-by: Pali Rohar <pali.rohar@gmail.com> |
| Tested-by: Paul Donohue <linux-kernel@PaulSD.com> |
| Tested-by: Nick Fletcher <nick.m.fletcher@gmail.com> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| |
| diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c |
| index 262d9b620fcf..f210e19ddba6 100644 |
| --- a/drivers/input/mouse/alps.c |
| +++ b/drivers/input/mouse/alps.c |
| @@ -1282,10 +1282,8 @@ static int alps_decode_ss4_v2(struct alps_fields *f, |
| /* handle buttons */ |
| if (pkt_id == SS4_PACKET_ID_STICK) { |
| f->ts_left = !!(SS4_BTN_V2(p) & 0x01); |
| - if (!(priv->flags & ALPS_BUTTONPAD)) { |
| - f->ts_right = !!(SS4_BTN_V2(p) & 0x02); |
| - f->ts_middle = !!(SS4_BTN_V2(p) & 0x04); |
| - } |
| + f->ts_right = !!(SS4_BTN_V2(p) & 0x02); |
| + f->ts_middle = !!(SS4_BTN_V2(p) & 0x04); |
| } else { |
| f->left = !!(SS4_BTN_V2(p) & 0x01); |
| if (!(priv->flags & ALPS_BUTTONPAD)) { |
| -- |
| 2.12.0 |
| |
