Merge branch 'next' into for-linus

[sfrench/cifs-2.6.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 5a0c999506598f77cdac45aac8ff4782080c91e0..870cfa6e2c44ed6791782401bb098096c4d052f4 100644 (file)
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -249,7 +249,7 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
                 * convert it to descriptor.
                 */
                if (!button->gpiod && gpio_is_valid(button->gpio)) {
                 * convert it to descriptor.
                 */
                if (!button->gpiod && gpio_is_valid(button->gpio)) {

-                       unsigned flags = 0;
+                       unsigned flags = GPIOF_IN;

 
                        if (button->active_low)
                                flags |= GPIOF_ACTIVE_LOW;
 
                        if (button->active_low)
                                flags |= GPIOF_ACTIVE_LOW;