Merge tag 'linux-kselftest-4.8-rc1-update' of git://git.kernel.org/pub/scm/linux...

[deliverable/linux.git] / drivers / input / input-mt.c

diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c
index 54fce56c80236808d5a6eb02fa6c8d17ebb76415..a1bbec9cda8d45e66274b4e287d068d1dcd9ca1c 100644 (file)
--- a/drivers/input/input-mt.c
+++ b/drivers/input/input-mt.c
@@ -218,8 +218,23 @@ void input_mt_report_pointer_emulation(struct input_dev *dev, bool use_count)
        }
 
        input_event(dev, EV_KEY, BTN_TOUCH, count > 0);
-       if (use_count)
+
+       if (use_count) {
+               if (count == 0 &&
+                   !test_bit(ABS_MT_DISTANCE, dev->absbit) &&
+                   test_bit(ABS_DISTANCE, dev->absbit) &&
+                   input_abs_get_val(dev, ABS_DISTANCE) != 0) {
+                       /*
+                        * Force reporting BTN_TOOL_FINGER for devices that
+                        * only report general hover (and not per-contact
+                        * distance) when contact is in proximity but not
+                        * on the surface.
+                        */
+                       count = 1;
+               }
+
                input_mt_report_finger_count(dev, count);
+       }
 
        if (oldest) {
                int x = input_mt_get_value(oldest, ABS_MT_POSITION_X);