diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-21 13:54:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-21 13:54:53 -0400 |
| commit | 7e08117de6ee17ae6c8f2983999a98cb95eb9bc2 (patch) | |
| tree | 077d02824bdb535ab63197bd78cf724b16bf434b | |
| parent | dc9c12f46fcf01d42756a73c681f18a99e7223b6 (diff) | |
| parent | 1ae5ddb6f8837558928a1a694c7b8af7f09fdd21 (diff) | |
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.
| -rw-r--r-- | drivers/input/keyboard/gpio_keys_polled.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c index 097d7216d98e..c6dc644aa580 100644 --- 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) | |||
| 246 | * convert it to descriptor. | 246 | * convert it to descriptor. |
| 247 | */ | 247 | */ |
| 248 | if (!button->gpiod && gpio_is_valid(button->gpio)) { | 248 | if (!button->gpiod && gpio_is_valid(button->gpio)) { |
| 249 | unsigned flags = 0; | 249 | unsigned flags = GPIOF_IN; |
| 250 | 250 | ||
| 251 | if (button->active_low) | 251 | if (button->active_low) |
| 252 | flags |= GPIOF_ACTIVE_LOW; | 252 | flags |= GPIOF_ACTIVE_LOW; |