diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-10-21 01:30:35 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-10-21 01:30:35 -0500 |
| commit | 701f68f192e35dfc22c6a456c8a60fb4e9ff7d02 (patch) | |
| tree | 609e21a8d27831ce88bb5ba717c5a6614606c7f5 /drivers/input/keyboard/gpio_keys_polled.c | |
| parent | b00df57e50e087151f4ca976ca2796ea105f68c1 (diff) | |
| parent | f249a14dd1b6b341e7b5e29b64c0edae6e13b7f5 (diff) | |
Merge tag 'lsk-v4.1-15.09' of http://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lng-v4.1linux-lng-4.1.7-2015.10
LSK 15.09 v4.1
Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
Conflicts:
linaro/configs/distribution.conf
Diffstat (limited to 'drivers/input/keyboard/gpio_keys_polled.c')
| -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) * 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; |