4 files changed, 26 insertions, 4 deletions

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index d327f5a2bb0e..b29ca651a395 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -602,6 +602,7 @@ gpio_keys_get_devtree_pdata(struct device *dev)
 
         i = 0;
         for_each_child_of_node(node, pp) {
+                int gpio;
                 enum of_gpio_flags flags;
 
                 if (!of_find_property(pp, "gpios", NULL)) {
@@ -610,9 +611,19 @@ gpio_keys_get_devtree_pdata(struct device *dev)
                         continue;
                 }
 
+                gpio = of_get_gpio_flags(pp, 0, &flags);
+                if (gpio < 0) {
+                        error = gpio;
+                        if (error != -EPROBE_DEFER)
+                                dev_err(dev,
+                                        "Failed to get gpio flags, error: %d\n",
+                                        error);
+                        goto err_free_pdata;
+                }
+
                 button = &pdata->buttons[i++];
 
-                button->gpio = of_get_gpio_flags(pp, 0, &flags);
+                button->gpio = gpio;
                 button->active_low = flags & OF_GPIO_ACTIVE_LOW;
 
                 if (of_property_read_u32(pp, "linux,code", &button->code)) {
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index f686fd970553..21147164874d 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -135,6 +135,7 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct
 
         i = 0;
         for_each_child_of_node(node, pp) {
+                int gpio;
                 enum of_gpio_flags flags;
 
                 if (!of_find_property(pp, "gpios", NULL)) {
@@ -143,9 +144,19 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct
                         continue;
                 }
 
+                gpio = of_get_gpio_flags(pp, 0, &flags);
+                if (gpio < 0) {
+                        error = gpio;
+                        if (error != -EPROBE_DEFER)
+                                dev_err(dev,
+                                        "Failed to get gpio flags, error: %d\n",
+                                        error);
+                        goto err_free_pdata;
+                }
+
                 button = &pdata->buttons[i++];
 
-                button->gpio = of_get_gpio_flags(pp, 0, &flags);
+                button->gpio = gpio;
                 button->active_low = flags & OF_GPIO_ACTIVE_LOW;
 
                 if (of_property_read_u32(pp, "linux,code", &button->code)) {
diff --git a/drivers/input/keyboard/tca8418_keypad.c b/drivers/input/keyboard/tca8418_keypad.c
index 50e9c5e195e1..a34cc6714e5b 100644
--- a/drivers/input/keyboard/tca8418_keypad.c
+++ b/drivers/input/keyboard/tca8418_keypad.c
@@ -384,7 +384,7 @@ static const struct i2c_device_id tca8418_id[] = {
 MODULE_DEVICE_TABLE(i2c, tca8418_id);
 
 #ifdef CONFIG_OF
-static const struct of_device_id tca8418_dt_ids[] __devinitconst = {
+static const struct of_device_id tca8418_dt_ids[] = {
         { .compatible = "ti,tca8418", },
         { }
 };
diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c
index e582922bacf7..cc7e0d4a8f93 100644
--- a/drivers/input/mouse/sentelic.c
+++ b/drivers/input/mouse/sentelic.c
@@ -791,7 +791,7 @@ static psmouse_ret_t fsp_process_byte(struct psmouse *psmouse)
                         fsp_set_slot(dev, 0, fgrs > 0, abs_x, abs_y);
                         fsp_set_slot(dev, 1, false, 0, 0);
                 }
-                if (fgrs > 0) {
+                if (fgrs == 1 || (fgrs == 2 && !(packet[0] & FSP_PB0_MFMC_FGR2))) {
                         input_report_abs(dev, ABS_X, abs_x);
                         input_report_abs(dev, ABS_Y, abs_y);
                 }