Input: gpio_keys - set input direction explicitly

[mirror_ubuntu-zesty-kernel.git] / drivers / input / keyboard / gpio_keys_polled.c

diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index 72b350315d4390cf76798b8cdc5b3246baa85956..bed4f2086158e3073b325dcc75fbcac3c51df4da 100644 (file)
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -314,6 +314,14 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
                                fwnode_handle_put(child);
                                return error;
                        }
+
+                       error = gpiod_direction_input(bdata->gpiod);
+                       if (error) {
+                               dev_err(dev, "Failed to configure GPIO %d as input: %d\n",
+                                       desc_to_gpio(bdata->gpiod), error);
+                               fwnode_handle_put(child);
+                               return error;
+                       }
                } else if (gpio_is_valid(button->gpio)) {
                        /*
                         * Legacy GPIO number so request the GPIO here and