Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / input / misc / uinput.c

diff --git a/kernel/drivers/input/misc/uinput.c b/kernel/drivers/input/misc/uinput.c
index 421e29e..2bb4c86 100644 (file)
--- a/kernel/drivers/input/misc/uinput.c
+++ b/kernel/drivers/input/misc/uinput.c
@@ -320,10 +320,8 @@ static int uinput_validate_absbits(struct input_dev *dev)
         * Check if absmin/absmax/absfuzz/absflat are sane.
         */
 
-       for (cnt = 0; cnt < ABS_CNT; cnt++) {
+       for_each_set_bit(cnt, dev->absbit, ABS_CNT) {
                int min, max;
-               if (!test_bit(cnt, dev->absbit))
-                       continue;
 
                min = input_abs_get_min(dev, cnt);
                max = input_abs_get_max(dev, cnt);
@@ -895,9 +893,15 @@ static long uinput_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 }
 
 #ifdef CONFIG_COMPAT
+
+#define UI_SET_PHYS_COMPAT     _IOW(UINPUT_IOCTL_BASE, 108, compat_uptr_t)
+
 static long uinput_compat_ioctl(struct file *file,
                                unsigned int cmd, unsigned long arg)
 {
+       if (cmd == UI_SET_PHYS_COMPAT)
+               cmd = UI_SET_PHYS;
+
        return uinput_ioctl_handler(file, cmd, arg, compat_ptr(arg));
 }
 #endif