]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Input: ALPS - handle 0-pressure 1F events
authorBen Gamari <ben@smart-cactus.org>
Tue, 4 Oct 2016 18:40:44 +0000 (11:40 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 4 Oct 2016 18:46:51 +0000 (11:46 -0700)
While a button is held SS5 hardware will give us single-finger packets
with x, y, and pressure equal to zero. This causes annoying jumps in
pointer position if a touch is released while the button is held. Handle
this by claiming zero contacts to ensure that no position events are
provided to the user.

Reviewed-by: Pali Rohár <pali.rohar@gmail.com>
Tested-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Ben Gamari <ben@smart-cactus.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/mouse/alps.c

index 8e15783d293242b58e2026a311065f6f3e181a17..a76e5c6fce54fbb0bdf30e7f9a69dc261da12e37 100644 (file)
@@ -1198,7 +1198,13 @@ static int alps_decode_ss4_v2(struct alps_fields *f,
                f->mt[0].x = SS4_1F_X_V2(p);
                f->mt[0].y = SS4_1F_Y_V2(p);
                f->pressure = ((SS4_1F_Z_V2(p)) * 2) & 0x7f;
-               f->fingers = 1;
+               /*
+                * When a button is held the device will give us events
+                * with x, y, and pressure of 0. This causes annoying jumps
+                * if a touch is released while the button is held.
+                * Handle this by claiming zero contacts.
+                */
+               f->fingers = f->pressure > 0 ? 1 : 0;
                f->first_mp = 0;
                f->is_mp = 0;
                break;