Merge tag 'v6.4' into next

[sfrench/cifs-2.6.git] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 641eb86f276e6da05e86ea1ddd9ae10069cefe7a..8c5fdb0f858ab5102926c0f6858f6a0f022c44b2 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -190,6 +190,7 @@ static int input_handle_abs_event(struct input_dev *dev,
                                  unsigned int code, int *pval)
 {
        struct input_mt *mt = dev->mt;
+       bool is_new_slot = false;
        bool is_mt_event;
        int *pold;
 
@@ -210,6 +211,7 @@ static int input_handle_abs_event(struct input_dev *dev,
                pold = &dev->absinfo[code].value;
        } else if (mt) {
                pold = &mt->slots[mt->slot].abs[code - ABS_MT_FIRST];
+               is_new_slot = mt->slot != dev->absinfo[ABS_MT_SLOT].value;
        } else {
                /*
                 * Bypass filtering for multi-touch events when
@@ -228,8 +230,8 @@ static int input_handle_abs_event(struct input_dev *dev,
        }
 
        /* Flush pending "slot" event */
-       if (is_mt_event && mt && mt->slot != input_abs_get_val(dev, ABS_MT_SLOT)) {
-               input_abs_set_val(dev, ABS_MT_SLOT, mt->slot);
+       if (is_new_slot) {
+               dev->absinfo[ABS_MT_SLOT].value = mt->slot;
                return INPUT_PASS_TO_HANDLERS | INPUT_SLOT;
        }