Input: Break out MT data

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

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 6c58bfff01a3446b8dee0d7d51eeff1f98fbe2aa..a0692c551be52844728a80670c8f576658aa73de 100644 (file)
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -653,20 +653,22 @@ static int evdev_handle_mt_request(struct input_dev *dev,
                                   unsigned int size,
                                   int __user *ip)
 {
-       const struct input_mt_slot *mt = dev->mt;
+       const struct input_mt *mt = dev->mt;
        unsigned int code;
        int max_slots;
        int i;
 
        if (get_user(code, &ip[0]))
                return -EFAULT;
-       if (!input_is_mt_value(code))
+       if (!mt || !input_is_mt_value(code))
                return -EINVAL;
 
        max_slots = (size - sizeof(__u32)) / sizeof(__s32);
-       for (i = 0; i < dev->mtsize && i < max_slots; i++)
-               if (put_user(input_mt_get_value(&mt[i], code), &ip[1 + i]))
+       for (i = 0; i < mt->num_slots && i < max_slots; i++) {
+               int value = input_mt_get_value(&mt->slots[i], code);
+               if (put_user(value, &ip[1 + i]))
                        return -EFAULT;
+       }
 
        return 0;
 }