Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index bea89722c4e..82542a1c109 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -680,6 +680,10 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd,
                         retval = uinput_set_bit(arg, swbit, SW_MAX);
                         break;
 
+                case UI_SET_PROPBIT:
+                        retval = uinput_set_bit(arg, propbit, INPUT_PROP_MAX);
+                        break;
+
                 case UI_SET_PHYS:
                         if (udev->state == UIST_CREATED) {
                                 retval = -EINVAL;