Merge branch 'next' into for-linus

Prepare first round of input updates for 4.2 merge window.

43 files changed, 1126 insertions, 276 deletions

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index a11ff74a5127..a35532ec00e4 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -25,6 +25,19 @@ config INPUT
 
 if INPUT
 
+config INPUT_LEDS
+        tristate "Export input device LEDs in sysfs"
+        depends on LEDS_CLASS
+        default INPUT
+        help
+          Say Y here if you would like to export LEDs on input devices
+          as standard LED class devices in sysfs.
+
+          If unsure, say Y.
+
+          To compile this driver as a module, choose M here: the
+          module will be called input-leds.
+
 config INPUT_FF_MEMLESS
         tristate "Support for memoryless force-feedback devices"
         help
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 5ca3f631497f..0c9302ca9954 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_INPUT_POLLDEV)	+= input-polldev.o
 obj-$(CONFIG_INPUT_SPARSEKMAP)  += sparse-keymap.o
 obj-$(CONFIG_INPUT_MATRIXKMAP)  += matrix-keymap.o
 
+obj-$(CONFIG_INPUT_LEDS)        += input-leds.o
 obj-$(CONFIG_INPUT_MOUSEDEV)    += mousedev.o
 obj-$(CONFIG_INPUT_JOYDEV)      += joydev.o
 obj-$(CONFIG_INPUT_EVDEV)       += evdev.o
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index a18f41b89b6a..9d35499faca4 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -422,10 +422,7 @@ static int evdev_release(struct inode *inode, struct file *file)
 
         evdev_detach_client(evdev, client);
 
-        if (is_vmalloc_addr(client))
-                vfree(client);
-        else
-                kfree(client);
+        kvfree(client);
 
         evdev_close_device(evdev);
 
diff --git a/drivers/input/ff-core.c b/drivers/input/ff-core.c
index b81c88c43452..8f4a30fccbb6 100644
--- a/drivers/input/ff-core.c
+++ b/drivers/input/ff-core.c
@@ -70,7 +70,7 @@ static int compat_effect(struct ff_device *ff, struct ff_effect *effect)
                         return -EINVAL;
 
                 /*
-                 * calculate manginude of sine wave as average of rumble's
+                 * calculate magnitude of sine wave as average of rumble's
                  * 2/3 of strong magnitude and 1/3 of weak magnitude
                  */
                 magnitude = effect->u.rumble.strong_magnitude / 3 +
@@ -213,7 +213,7 @@ static int erase_effect(struct input_dev *dev, int effect_id,
 /**
  * input_ff_erase - erase a force-feedback effect from device
  * @dev: input device to erase effect from
- * @effect_id: id of the ffect to be erased
+ * @effect_id: id of the effect to be erased
  * @file: purported owner of the request
  *
  * This function erases a force-feedback effect from specified device.
diff --git a/drivers/input/input-leds.c b/drivers/input/input-leds.c
new file mode 100644
index 000000000000..074a65ed17bb
--- /dev/null
+++ b/drivers/input/input-leds.c
@@ -0,0 +1,212 @@
+/*
+ * LED support for the input layer
+ *
+ * Copyright 2010-2015 Samuel Thibault <samuel.thibault@ens-lyon.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/leds.h>
+#include <linux/input.h>
+
+#if IS_ENABLED(CONFIG_VT)
+#define VT_TRIGGER(_name)       .trigger = _name
+#else
+#define VT_TRIGGER(_name)       .trigger = NULL
+#endif
+
+static const struct {
+        const char *name;
+        const char *trigger;
+} input_led_info[LED_CNT] = {
+        [LED_NUML]      = { "numlock", VT_TRIGGER("kbd-numlock") },
+        [LED_CAPSL]     = { "capslock", VT_TRIGGER("kbd-capslock") },
+        [LED_SCROLLL]   = { "scrolllock", VT_TRIGGER("kbd-scrolllock") },
+        [LED_COMPOSE]   = { "compose" },
+        [LED_KANA]      = { "kana", VT_TRIGGER("kbd-kanalock") },
+        [LED_SLEEP]     = { "sleep" } ,
+        [LED_SUSPEND]   = { "suspend" },
+        [LED_MUTE]      = { "mute" },
+        [LED_MISC]      = { "misc" },
+        [LED_MAIL]      = { "mail" },
+        [LED_CHARGING]  = { "charging" },
+};
+
+struct input_led {
+        struct led_classdev cdev;
+        struct input_handle *handle;
+        unsigned int code; /* One of LED_* constants */
+};
+
+struct input_leds {
+        struct input_handle handle;
+        unsigned int num_leds;
+        struct input_led leds[];
+};
+
+static enum led_brightness input_leds_brightness_get(struct led_classdev *cdev)
+{
+        struct input_led *led = container_of(cdev, struct input_led, cdev);
+        struct input_dev *input = led->handle->dev;
+
+        return test_bit(led->code, input->led) ? cdev->max_brightness : 0;
+}
+
+static void input_leds_brightness_set(struct led_classdev *cdev,
+                                      enum led_brightness brightness)</