1 files changed, 14 insertions, 6 deletions

diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 92595b98e7ed..022be0e22eba 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -263,13 +263,21 @@ static int uinput_create_device(struct uinput_device *udev)
                 return -EINVAL;
         }
 
-        if (test_bit(ABS_MT_SLOT, dev->absbit)) {
-                nslot = input_abs_get_max(dev, ABS_MT_SLOT) + 1;
-                error = input_mt_init_slots(dev, nslot, 0);
-                if (error)
+        if (test_bit(EV_ABS, dev->evbit)) {
+                input_alloc_absinfo(dev);
+                if (!dev->absinfo) {
+                        error = -EINVAL;
                         goto fail1;
-        } else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) {
-                input_set_events_per_packet(dev, 60);
+                }
+
+                if (test_bit(ABS_MT_SLOT, dev->absbit)) {
+                        nslot = input_abs_get_max(dev, ABS_MT_SLOT) + 1;
+                        error = input_mt_init_slots(dev, nslot, 0);
+                        if (error)
+                                goto fail1;
+                } else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) {
+                        input_set_events_per_packet(dev, 60);
+                }
         }
 
         if (test_bit(EV_FF, dev->evbit) && !udev->ff_effects_max) {