Merge branch 'for-next' of github.com:rydberg/linux into next

3 files changed, 28 insertions, 2 deletions

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 3626b1ce4609..cfe78597eb68 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -20,7 +20,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/input.h>
+#include <linux/input/mt.h>
 #include <linux/major.h>
 #include <linux/device.h>
 #include "input-compat.h"
@@ -632,6 +632,28 @@ static int evdev_handle_set_keycode_v2(struct input_dev *dev, void __user *p)
         return input_set_keycode(dev, &ke);
 }
 
+static int evdev_handle_mt_request(struct input_dev *dev,
+                                   unsigned int size,
+                                   int __user *ip)
+{
+        const struct input_mt_slot *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))
+                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]))
+                        return -EFAULT;
+
+        return 0;
+}
+
 static long evdev_do_ioctl(struct file *file, unsigned int cmd,
                            void __user *p, int compat_mode)
 {
@@ -725,6 +747,9 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd,
                 return bits_to_user(dev->propbit, INPUT_PROP_MAX,
                                     size, p, compat_mode);
 
+        case EVIOCGMTSLOTS(0):
+                return evdev_handle_mt_request(dev, size, ip);
+
         case EVIOCGKEY(0):
                 return bits_to_user(dev->key, KEY_MAX, size, p, compat_mode);
 
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 1f78c957a75a..8921c6180c51 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -180,7 +180,7 @@ static int input_handle_abs_event(struct input_dev *dev,
                 return INPUT_IGNORE_EVENT;
         }
 
-        is_mt_event = code >= ABS_MT_FIRST && code <= ABS_MT_LAST;
+        is_mt_event = input_is_mt_value(code);
 
         if (!is_mt_event) {
                 pold = &dev->absinfo[code].value;
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 927e479c2649..f9e2758b9f46 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -433,6 +433,7 @@ static void setup_events_to_report(struct input_dev *input_dev,
         __set_bit(BTN_TOOL_QUADTAP, input_dev->keybit);
         __set_bit(BTN_LEFT, input_dev->keybit);
 
+        __set_bit(INPUT_PROP_POINTER, input_dev->propbit);
         if (cfg->caps & HAS_INTEGRATED_BUTTON)
                 __set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit);