projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[linux-2.6-block.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 097d7216d98ee4e4d394726e9d4c9743067d14f8..c6dc644aa5806b37cb4e0dcbbc6217d915e8a562 100644
(file)
--- a/
drivers/input/keyboard/gpio_keys_polled.c
+++ b/
drivers/input/keyboard/gpio_keys_polled.c
@@
-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;