9 files changed, 33 insertions, 21 deletions

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 6727954ab74b..e8a84d12b7ff 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -1207,7 +1207,6 @@ static void xpad_led_disconnect(struct usb_xpad *xpad)
 #else
 static int xpad_led_probe(struct usb_xpad *xpad) { return 0; }
 static void xpad_led_disconnect(struct usb_xpad *xpad) { }
-static void xpad_identify_controller(struct usb_xpad *xpad) { }
 #endif
 
 static int xpad_start_input(struct usb_xpad *xpad)
diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c
index 4d446d5085aa..c01a1d648f9f 100644
--- a/drivers/input/keyboard/adp5589-keys.c
+++ b/drivers/input/keyboard/adp5589-keys.c
@@ -235,7 +235,7 @@ struct adp5589_kpad {
         unsigned short gpimapsize;
         unsigned extend_cfg;
         bool is_adp5585;
-        bool adp5585_support_row5;
+        bool support_row5;
 #ifdef CONFIG_GPIOLIB
         unsigned char gpiomap[ADP5589_MAXGPIO];
         bool export_gpio;
@@ -485,7 +485,7 @@ static int adp5589_build_gpiomap(struct adp5589_kpad *kpad,
         if (kpad->extend_cfg & C4_EXTEND_CFG)
                 pin_used[kpad->var->c4_extend_cfg] = true;
 
-        if (!kpad->adp5585_support_row5)
+        if (!kpad->support_row5)
                 pin_used[5] = true;
 
         for (i = 0; i < kpad->var->maxgpio; i++)
@@ -884,12 +884,13 @@ static int adp5589_probe(struct i2c_client *client,
 
         switch (id->driver_data) {
         case ADP5585_02:
-                kpad->adp5585_support_row5 = true;
+                kpad->support_row5 = true;
         case ADP5585_01:
                 kpad->is_adp5585 = true;
                 kpad->var = &const_adp5585;
                 break;
         case ADP5589:
+                kpad->support_row5 = true;
                 kpad->var = &const_adp5589;
                 break;
         }
diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c
index 378db10001df..4401be225d64 100644
--- a/drivers/input/keyboard/cap11xx.c
+++ b/drivers/input/keyboard/cap11xx.c
@@ -304,8 +304,10 @@ static int cap11xx_init_leds(struct device *dev,
                 led->cdev.brightness = LED_OFF;
 
                 error = of_property_read_u32(child, "reg", &reg);
-                if (error != 0 || reg >= num_leds)
+                if (error != 0 || reg >= num_leds) {
+                        of_node_put(child);
                         return -EINVAL;
+                }
 
                 led->reg = reg;
                 led->priv = priv;
@@ -313,8 +315,10 @@ static int cap11xx_init_leds(struct device *dev,
                 INIT_WORK(&led->work, cap11xx_led_work);
 
                 error = devm_led_classdev_register(dev, &led->cdev);
-                if (error)
+                if (error) {
+                        of_node_put(child);
                         return error;
+                }
 
                 priv->num_leds++;
                 led++;
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index d6d16fa78281..1f2337abcf2f 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -733,7 +733,7 @@ config INPUT_XEN_KBDDEV_FRONTEND
           module will be called xen-kbdfront.
 
 config INPUT_SIRFSOC_ONKEY
-        bool "CSR SiRFSoC power on/off/suspend key support"
+        tristate "CSR SiRFSoC power on/off/suspend key support"
         depends on ARCH_SIRF && OF
         default y
         help
diff --git a/drivers/input/misc/sirfsoc-onkey.c b/drivers/input/misc/sirfsoc-onkey.c
index 9d5b89befe6f..ed7237f19539 100644
--- a/drivers/input/misc/sirfsoc-onkey.c
+++ b/drivers/input/misc/sirfsoc-onkey.c
@@ -101,7 +101,7 @@ static void sirfsoc_pwrc_close(struct input_dev *input)
 static const struct of_device_id sirfsoc_pwrc_of_match[] = {
         { .compatible = "sirf,prima2-pwrc" },
         {},
-}
+};
 MODULE_DEVICE_TABLE(of, sirfsoc_pwrc_of_match);
 
 static int sirfsoc_pwrc_probe(struct platform_device *pdev)
diff --git a/drivers/input/mouse/vmmouse.c b/drivers/input/mouse/vmmouse.c
index e272f06258ce..a3f0f5a47490 100644
--- a/drivers/input/mouse/vmmouse.c
+++ b/drivers/input/mouse/vmmouse.c
@@ -458,8 +458,6 @@ int vmmouse_init(struct psmouse *psmouse)
         priv->abs_dev = abs_dev;
         psmouse->private = priv;
 
-        input_set_capability(rel_dev, EV_REL, REL_WHEEL);
-
         /* Set up and register absolute device */
         snprintf(priv->phys, sizeof(priv->phys), "%s/input1",
                  psmouse->ps2dev.serio->phys);
@@ -475,10 +473,6 @@ int vmmouse_init(struct psmouse *psmouse)
         abs_dev->id.version = psmouse->model;
         abs_dev->dev.parent = &psmouse->ps2dev.serio->dev;
 
-        error = input_register_device(priv->abs_dev);
-        if (error)
-                goto init_fail;
-
         /* Set absolute device capabilities */
         input_set_capability(abs_dev, EV_KEY, BTN_LEFT);
         input_set_capability(abs_dev, EV_KEY, BTN_RIGHT);
@@ -488,6 +482,13 @@ int vmmouse_init(struct psmouse *psmouse)
         input_set_abs_params(abs_dev, ABS_X, 0, VMMOUSE_MAX_X, 0, 0);
         input_set_abs_params(abs_dev, ABS_Y, 0, VMMOUSE_MAX_Y, 0, 0);
 
+        error = input_register_device(priv->abs_dev);
+        if (error)
+                goto init_fail;
+
+        /* Add wheel capability to the relative device */
+        input_set_capability(rel_dev, EV_REL, REL_WHEEL);
+
         psmouse->protocol_handler = vmmouse_process_byte;
         psmouse->disconnect = vmmouse_disconnect;
         psmouse->reconnect = vmmouse_reconnect;
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 8f828975ab10..1ca7f551e2da 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -134,7 +134,7 @@ static void serio_find_driver(struct serio *serio)
         int error;
 
         error = device_attach(&serio->dev);
-        if (error < 0)
+        if (error < 0 && error != -EPROBE_DEFER)
                 dev_warn(&serio->dev,
                          "device_attach() failed for %s (%s), error: %d\n",
                          serio->phys, serio->name, error);
diff --git a/drivers/input/touchscreen/colibri-vf50-ts.c b/drivers/input/touchscreen/colibri-vf50-ts.c
index 5d4903a402cc..69828d015d45 100644
--- a/drivers/input/touchscreen/colibri-vf50-ts.c
+++ b/drivers/input/touchscreen/colibri-vf50-ts.c
@@ -21,6 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index 0b0f8c17f3f7..23fbe382da8b 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -822,16 +822,22 @@ static void edt_ft5x06_ts_get_defaults(struct device *dev,
         int error;
 
         error = device_property_read_u32(dev, "threshold", &val);
-        if (!error)
-                reg_addr->reg_threshold = val;
+        if (!error) {
+                edt_ft5x06_register_write(tsdata, reg_addr->reg_threshold, val);
+                tsdata->threshold = val;
+        }
 
         error = device_property_read_u32(dev, "gain", &val);
-        if (!error)
-                reg_addr->reg_gain = val;
+        if (!error) {
+                edt_ft5x06_register_write(tsdata, reg_addr->reg_gain, val);
+                tsdata->gain = val;
+        }
 
         error = device_property_read_u32(dev, "offset", &val);
-        if (!error)
-                reg_addr->reg_offset = val;
+        if (!error) {
+                edt_ft5x06_register_write(tsdata, reg_addr->reg_offset, val);
+                tsdata->offset = val;
+        }
 }
 
 static void