Merge branch 'next' into for-linus

Merge first round of changes for 3.13 merge window.

11 files changed, 28 insertions, 17 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index aa51baaa9b1e..5f4967d01bc3 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -156,7 +156,7 @@ config INPUT_MAX8925_ONKEY
 
 config INPUT_MAX8997_HAPTIC
         tristate "MAXIM MAX8997 haptic controller support"
-        depends on HAVE_PWM && MFD_MAX8997
+        depends on PWM && HAVE_PWM && MFD_MAX8997
         select INPUT_FF_MEMLESS
         help
           This option enables device driver support for the haptic controller
@@ -461,7 +461,7 @@ config INPUT_PCF8574
 
 config INPUT_PWM_BEEPER
         tristate "PWM beeper support"
-        depends on HAVE_PWM || PWM
+        depends on PWM && HAVE_PWM
         help
           Say Y here to get support for PWM based beeper devices.
 
diff --git a/drivers/input/misc/ad714x-spi.c b/drivers/input/misc/ad714x-spi.c
index 61891486067c..3a90b710e309 100644
--- a/drivers/input/misc/ad714x-spi.c
+++ b/drivers/input/misc/ad714x-spi.c
@@ -108,7 +108,6 @@ static int ad714x_spi_remove(struct spi_device *spi)
         struct ad714x_chip *chip = spi_get_drvdata(spi);
 
         ad714x_remove(chip);
-        spi_set_drvdata(spi, NULL);
 
         return 0;
 }
diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
index 4f77f87847e8..b5d71d245854 100644
--- a/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
@@ -131,7 +131,6 @@ static int cobalt_buttons_probe(struct platform_device *pdev)
  err_free_mem:
         input_free_polled_device(poll_dev);
         kfree(bdev);
-        dev_set_drvdata(&pdev->dev, NULL);
         return error;
 }
 
@@ -144,7 +143,6 @@ static int cobalt_buttons_remove(struct platform_device *pdev)
         input_free_polled_device(bdev->poll_dev);
         iounmap(bdev->reg);
         kfree(bdev);
-        dev_set_drvdata(dev, NULL);
 
         return 0;
 }
diff --git a/drivers/input/misc/da9055_onkey.c b/drivers/input/misc/da9055_onkey.c
index ee6ae3a00174..a0af8b2506ce 100644
--- a/drivers/input/misc/da9055_onkey.c
+++ b/drivers/input/misc/da9055_onkey.c
@@ -36,7 +36,7 @@ static void da9055_onkey_query(struct da9055_onkey *onkey)
         } else {
                 key_stat &= DA9055_NOKEY_STS;
                 /*
-                 * Onkey status bit is cleared when onkey button is relased.
+                 * Onkey status bit is cleared when onkey button is released.
                  */
                 if (!key_stat) {
                         input_report_key(onkey->input, KEY_POWER, 0);
diff --git a/drivers/input/misc/mma8450.c b/drivers/input/misc/mma8450.c
index f3309696d053..59d4dcddf6de 100644
--- a/drivers/input/misc/mma8450.c
+++ b/drivers/input/misc/mma8450.c
@@ -168,7 +168,7 @@ static void mma8450_close(struct input_polled_dev *dev)
  * I2C init/probing/exit functions
  */
 static int mma8450_probe(struct i2c_client *c,
-                                   const struct i2c_device_id *id)
+                         const struct i2c_device_id *id)
 {
         struct input_polled_dev *idev;
         struct mma8450 *m;
@@ -204,6 +204,8 @@ static int mma8450_probe(struct i2c_client *c,
                 goto err_free_mem;
         }
 
+        i2c_set_clientdata(c, m);
+
         return 0;
 
 err_free_mem:
diff --git a/drivers/input/misc/mpu3050.c b/drivers/input/misc/mpu3050.c
index dce0d95943c5..6983ffbbfb94 100644
--- a/drivers/input/misc/mpu3050.c
+++ b/drivers/input/misc/mpu3050.c
@@ -383,6 +383,7 @@ static int mpu3050_probe(struct i2c_client *client,
 
         pm_runtime_enable(&client->dev);
         pm_runtime_set_autosuspend_delay(&client->dev, MPU3050_AUTO_DELAY);
+        i2c_set_clientdata(client, sensor);
 
         return 0;
 
diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c
index 2ff4d1c78ab8..940566e7be13 100644
--- a/drivers/input/misc/pwm-beeper.c
+++ b/drivers/input/misc/pwm-beeper.c
@@ -16,6 +16,7 @@
 #include <linux/input.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
 #include <linux/slab.h>
diff --git a/drivers/input/misc/rb532_button.c b/drivers/input/misc/rb532_button.c
index fb4f8ac3343b..83fff38b86b3 100644
--- a/drivers/input/misc/rb532_button.c
+++ b/drivers/input/misc/rb532_button.c
@@ -87,7 +87,6 @@ static int rb532_button_remove(struct platform_device *pdev)
 
         input_unregister_polled_device(poll_dev);
         input_free_polled_device(poll_dev);
-        dev_set_drvdata(&pdev->dev, NULL);
 
         return 0;
 }
diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index 5b1aff825138..f920ba7ab51f 100644
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c
@@ -24,6 +24,7 @@
 #include <linux/gpio.h>
 #include <linux/rotary_encoder.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
 
diff --git a/drivers/input/misc/sirfsoc-onkey.c b/drivers/input/misc/sirfsoc-onkey.c
index 0621c367049a..7b8b03e0d0be 100644
--- a/drivers/input/misc/sirfsoc-onkey.c
+++ b/drivers/input/misc/sirfsoc-onkey.c
@@ -153,7 +153,7 @@ static struct platform_driver sirfsoc_pwrc_driver = {
                 .name   = "sirfsoc-pwrc",
                 .owner  = THIS_MODULE,
                 .pm     = &sirfsoc_pwrc_pm_ops,
-                .of_match_table = of_match_ptr(sirfsoc_pwrc_of_match),
+                .of_match_table = sirfsoc_pwrc_of_match,
         }
 };
 
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index a0a4bbaef02c..772835938a52 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -430,20 +430,30 @@ static int uinput_setup_device(struct uinput_device *udev,
         return retval;
 }
 
-static ssize_t uinput_inject_event(struct uinput_device *udev,
-                                   const char __user *buffer, size_t count)
+static ssize_t uinput_inject_events(struct uinput_device *udev,
+                                    const char __user *buffer, size_t count)
 {
         struct input_event ev;
+        size_t bytes = 0;
 
-        if (count < input_event_size())
+        if (count != 0 && count < input_event_size())
                 return -EINVAL;
 
-        if (input_event_from_user(buffer, &ev))
-                return -EFAULT;
+        while (bytes + input_event_size() <= count) {
+                /*
+                 * Note that even if some events were fetched successfully
+                 * we are still going to return EFAULT instead of partial
+                 * count to let userspace know that it got it's buffers
+                 * all wrong.
+                 */
+                if (input_event_from_user(buffer + bytes, &ev))
+                        return -EFAULT;
 
-        input_event(udev->dev, ev.type, ev.code, ev.value);
+                input_event(udev->dev, ev.type, ev.code, ev.value);
+                bytes += input_event_size();
+        }
 
-        return input_event_size();
+        return bytes;
 }
 
 static ssize_t uinput_write(struct file *file, const char __user *buffer,
@@ -460,7 +470,7 @@ static ssize_t uinput_write(struct file *file, const char __user *buffer,
                 return retval;
 
         retval = udev->state == UIST_CREATED ?
-                        uinput_inject_event(udev, buffer, count) :
+                        uinput_inject_events(udev, buffer, count) :
                         uinput_setup_device(udev, buffer, count);
 
         mutex_unlock(&udev->mutex);