aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Pelletier <plr.vincent@gmail.com>2015-08-20 12:00:19 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-08-20 12:07:37 -0700
commit1ae5ddb6f8837558928a1a694c7b8af7f09fdd21 (patch)
treece1d2c69953e2bd3ddea047ca60b4a1e266629f2
parent6b30c73e9f37183ad60c7f7050acf8e8edf91e9c (diff)
downloadlinux-yocto-4.8-1ae5ddb6f8837558928a1a694c7b8af7f09fdd21.tar.gz
linux-yocto-4.8-1ae5ddb6f8837558928a1a694c7b8af7f09fdd21.tar.bz2
linux-yocto-4.8-1ae5ddb6f8837558928a1a694c7b8af7f09fdd21.zip
Input: gpio_keys_polled - request GPIO pin as input.
GPIOF_IN flag was lost in: Commit 633a21d80b4a("input: gpio_keys_polled: Add support for GPIO descriptors"). Without this flag, legacy code path (for non-descriptor GPIO declarations) would configure GPIO as output (0 meaning GPIOF_DIR_OUT | GPIOF_INIT_LOW). Cc: stable@vger.kernel.org Signed-off-by: Vincent Pelletier <plr.vincent@gmail.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/keyboard/gpio_keys_polled.c2
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 90df4df58b07..959b826d25c8 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;