Skip to content

Commit 47e6fb4

Browse files
Masaki Otadtor
authored andcommitted
Input: ALPS - fix trackstick button handling on V8 devices
Alps stick devices always have physical buttons, so we should not check ALPS_BUTTONPAD flag to decide whether we should report them. Fixes: 4777ac2 ("Input: ALPS - add touchstick support for SS5 hardware") Signed-off-by: Masaki Ota <[email protected]> Acked-by: Pali Rohar <[email protected]> Tested-by: Paul Donohue <[email protected]> Tested-by: Nick Fletcher <[email protected]> Cc: [email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent e734839 commit 47e6fb4

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/input/mouse/alps.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,10 +1282,8 @@ static int alps_decode_ss4_v2(struct alps_fields *f,
12821282
/* handle buttons */
12831283
if (pkt_id == SS4_PACKET_ID_STICK) {
12841284
f->ts_left = !!(SS4_BTN_V2(p) & 0x01);
1285-
if (!(priv->flags & ALPS_BUTTONPAD)) {
1286-
f->ts_right = !!(SS4_BTN_V2(p) & 0x02);
1287-
f->ts_middle = !!(SS4_BTN_V2(p) & 0x04);
1288-
}
1285+
f->ts_right = !!(SS4_BTN_V2(p) & 0x02);
1286+
f->ts_middle = !!(SS4_BTN_V2(p) & 0x04);
12891287
} else {
12901288
f->left = !!(SS4_BTN_V2(p) & 0x01);
12911289
if (!(priv->flags & ALPS_BUTTONPAD)) {

0 commit comments

Comments
 (0)