Commit 7e08117d authored by Linus Torvalds's avatar Linus Torvalds

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.
parents dc9c12f4 1ae5ddb6
...@@ -246,7 +246,7 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) ...@@ -246,7 +246,7 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
* convert it to descriptor. * convert it to descriptor.
*/ */
if (!button->gpiod && gpio_is_valid(button->gpio)) { if (!button->gpiod && gpio_is_valid(button->gpio)) {
unsigned flags = 0; unsigned flags = GPIOF_IN;
if (button->active_low) if (button->active_low)
flags |= GPIOF_ACTIVE_LOW; flags |= GPIOF_ACTIVE_LOW;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment