aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-08-15 16:00:42 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-06-11 10:23:39 -0700
commitc258e84b180d38f76ab9962cf5bfc10720af1360 (patch)
tree2ca727357b17b22807e85c0c8ccfc692f1a1ed84 /drivers
parentInput: make input_report_slot_state() return boolean (diff)
downloadlinux-dev-c258e84b180d38f76ab9962cf5bfc10720af1360.tar.xz
linux-dev-c258e84b180d38f76ab9962cf5bfc10720af1360.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/input-mt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c
index 8de52e3c00c0..4a69716e5461 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);