Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Aug 2015 17:54:53 +0000 (10:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Aug 2015 17:54:53 +0000 (10:54 -0700)
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.

1  2 
drivers/input/keyboard/gpio_keys_polled.c

index 097d7216d98ee4e4d394726e9d4c9743067d14f8,959b826d25c8b4de69c9bad5bff00039268609fd..c6dc644aa5806b37cb4e0dcbbc6217d915e8a562
@@@ -125,7 -125,7 +125,7 @@@ static struct gpio_keys_platform_data *
        device_for_each_child_node(dev, child) {
                struct gpio_desc *desc;
  
 -              desc = devm_get_gpiod_from_child(dev, child);
 +              desc = devm_get_gpiod_from_child(dev, NULL, child);
                if (IS_ERR(desc)) {
                        error = PTR_ERR(desc);
                        if (error != -EPROBE_DEFER)
@@@ -246,7 -246,7 +246,7 @@@ static int gpio_keys_polled_probe(struc
                 * 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;