commit 7e08117de6ee17ae6c8f2983999a98cb95eb9bc2
author Linus Torvalds <torvalds@linux-foundation.org> Fri Aug 21 10:54:53 2015 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Aug 21 10:54:53 2015 -0700
tree 077d02824bdb535ab63197bd78cf724b16bf434b
parent dc9c12f46fcf01d42756a73c681f18a99e7223b6
parent 1ae5ddb6f8837558928a1a694c7b8af7f09fdd21

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input layer fix from Dmitry Torokhov:
 "A small fixup to gpio_keys_polled driver"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: gpio_keys_polled - request GPIO pin as input.

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 097d721..c6dc644 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -246,7 +246,7 @@
 		 * 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;