Merge branch 'next' into for-linus

Prepare first round of input updates for 3.17.

3 files changed, 31 insertions, 20 deletions

diff --git a/drivers/input/misc/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c
index 01f3b5b300f3..a3fe4a990cc9 100644
--- a/drivers/input/misc/keyspan_remote.c
+++ b/drivers/input/misc/keyspan_remote.c
@@ -392,7 +392,6 @@ static void keyspan_irq_recv(struct urb *urb)
 
         default:
                 goto resubmit;
-                break;
         }
 
         if (debug)
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
index 5a6334be30b8..e34dfc29beb3 100644
--- a/drivers/input/misc/soc_button_array.c
+++ b/drivers/input/misc/soc_button_array.c
@@ -83,6 +83,9 @@ soc_button_device_create(struct pnp_dev *pdev,
                                        sizeof(*gpio_keys_pdata) +
                                         sizeof(*gpio_keys) * MAX_NBUTTONS,
                                        GFP_KERNEL);
+        if (!gpio_keys_pdata)
+                return ERR_PTR(-ENOMEM);
+
         gpio_keys = (void *)(gpio_keys_pdata + 1);
 
         for (info = button_info; info->name; info++) {
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 856936247500..421e29e4cd81 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -311,7 +311,14 @@ static int uinput_open(struct inode *inode, struct file *file)
 static int uinput_validate_absbits(struct input_dev *dev)
 {
         unsigned int cnt;
-        int retval = 0;
+        int nslot;
+
+        if (!test_bit(EV_ABS, dev->evbit))
+                return 0;
+
+        /*
+         * Check if absmin/absmax/absfuzz/absflat are sane.
+         */
 
         for (cnt = 0; cnt < ABS_CNT; cnt++) {
                 int min, max;
@@ -327,8 +334,7 @@ static int uinput_validate_absbits(struct input_dev *dev)
                                 UINPUT_NAME, cnt,
                                 input_abs_get_min(dev, cnt),
                                 input_abs_get_max(dev, cnt));
-                        retval = -EINVAL;
-                        break;
+                        return -EINVAL;
                 }
 
                 if (input_abs_get_flat(dev, cnt) >
@@ -340,11 +346,18 @@ static int uinput_validate_absbits(struct input_dev *dev)
                                 input_abs_get_flat(dev, cnt),
                                 input_abs_get_min(dev, cnt),
                                 input_abs_get_max(dev, cnt));
-                        retval = -EINVAL;
-                        break;
+                        return -EINVAL;
                 }
         }
-        return retval;
+
+        if (test_bit(ABS_MT_SLOT, dev->absbit)) {
+                nslot = input_abs_get_max(dev, ABS_MT_SLOT) + 1;
+                input_mt_init_slots(dev, nslot, 0);
+        } else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) {
+                input_set_events_per_packet(dev, 60);
+        }
+
+        return 0;
 }
 
 static int uinput_allocate_device(struct uinput_device *udev)
@@ -410,19 +423,9 @@ static int uinput_setup_device(struct uinput_device *udev,
                 input_abs_set_flat(dev, i, user_dev->absflat[i]);
         }
 
-        /* check if absmin/absmax/absfuzz/absflat are filled as
-         * told in Documentation/input/input-programming.txt */
-        if (test_bit(EV_ABS, dev->evbit)) {
-                retval = uinput_validate_absbits(dev);
-                if (retval < 0)
-                        goto exit;
-                if (test_bit(ABS_MT_SLOT, dev->absbit)) {
-                        int nslot = input_abs_get_max(dev, ABS_MT_SLOT) + 1;
-                        input_mt_init_slots(dev, nslot, 0);
-                } else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) {
-                        input_set_events_per_packet(dev, 60);
-                }
-        }
+        retval = uinput_validate_absbits(dev);
+        if (retval < 0)
+                goto exit;
 
         udev->state = UIST_SETUP_COMPLETE;
         retval = count;
@@ -720,6 +723,12 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd,
         }
 
         switch (cmd) {
+                case UI_GET_VERSION:
+                        if (put_user(UINPUT_VERSION,
+                                     (unsigned int __user *)p))
+                                retval = -EFAULT;
+                        goto out;
+
                 case UI_DEV_CREATE:
                         retval = uinput_create_device(udev);
                         goto out;