From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 15 Aug 2017 23:00:42 +0000 (-0700)
Subject: Input: do not assign new tracking ID when changing tool type
X-Git-Tag: v4.18-rc3~35^2~6^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c258e84b180d38f76ab9962cf5bfc10720af1360;p=thirdparty%2Fkernel%2Flinux.git

Input: do not assign new tracking ID when changing tool type

We allow changing tool type (from MT_TOOL_FINGER to MT_TOOL_PALM) so we
should not be forcing new tracking ID for the slot.

Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c
index 8de52e3c00c03..4a69716e54614 100644
--- a/drivers/input/input-mt.c
+++ b/drivers/input/input-mt.c
@@ -153,7 +153,7 @@ bool input_mt_report_slot_state(struct input_dev *dev,
 	}
 
 	id = input_mt_get_value(slot, ABS_MT_TRACKING_ID);
-	if (id < 0 || input_mt_get_value(slot, ABS_MT_TOOL_TYPE) != tool_type)
+	if (id < 0)
 		id = input_mt_new_trkid(mt);
 
 	input_event(dev, EV_ABS, ABS_MT_TRACKING_ID, id);