Commit 7e08117d authored Aug 21, 2015 by Linus Torvalds

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.

parents dc9c12f4 1ae5ddb6

drivers/input/keyboard/gpio_keys_polled.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -246,7 +246,7 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
		* 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;