Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[deliverable/linux.git] / drivers / input / misc / uinput.c

diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index abe1a927b3328d22af925832f7b8c7c0bc76f2bb..65ebbd11170221c8d0180958040c1d1c2f939dda 100644 (file)
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -981,9 +981,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