Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[firefly-linux-kernel-4.4.55.git] / drivers / input / input-mt.c

diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c
index 47a6009dbf43f04ba6dcd883513127857591a70f..d398f1321f143f834e5ddc70563ed368ca130c24 100644 (file)
--- a/drivers/input/input-mt.c
+++ b/drivers/input/input-mt.c
@@ -18,6 +18,7 @@ static void copy_abs(struct input_dev *dev, unsigned int dst, unsigned int src)
 {
        if (dev->absinfo && test_bit(src, dev->absbit)) {
                dev->absinfo[dst] = dev->absinfo[src];
+               dev->absinfo[dst].fuzz = 0;
                dev->absbit[BIT_WORD(dst)] |= BIT_MASK(dst);
        }
 }
@@ -78,6 +79,8 @@ int input_mt_init_slots(struct input_dev *dev, unsigned int num_slots,
        }
        if (flags & INPUT_MT_DIRECT)
                __set_bit(INPUT_PROP_DIRECT, dev->propbit);
+       if (flags & INPUT_MT_SEMI_MT)
+               __set_bit(INPUT_PROP_SEMI_MT, dev->propbit);
        if (flags & INPUT_MT_TRACK) {
                unsigned int n2 = num_slots * num_slots;
                mt->red = kcalloc(n2, sizeof(*mt->red), GFP_KERNEL);
@@ -245,6 +248,7 @@ void input_mt_sync_frame(struct input_dev *dev)
 {
        struct input_mt *mt = dev->mt;
        struct input_mt_slot *s;
+       bool use_count = false;
 
        if (!mt)
                return;
@@ -258,7 +262,10 @@ void input_mt_sync_frame(struct input_dev *dev)
                }
        }
 
-       input_mt_report_pointer_emulation(dev, (mt->flags & INPUT_MT_POINTER));
+       if ((mt->flags & INPUT_MT_POINTER) && !(mt->flags & INPUT_MT_SEMI_MT))
+               use_count = true;
+
+       input_mt_report_pointer_emulation(dev, use_count);
 
        mt->frame++;
 }