| Message ID | 7d70142c2f6133128c26cc1ca3a883d8cadbce64.1440092849.git.plr.vincent@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Aug 20, 2015 at 07:50:00PM +0200, Vincent Pelletier wrote: > 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). > > Signed-off-by: Vincent Pelletier <plr.vincent@gmail.com> > Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Applied and tagged for stable, thank you. > --- > drivers/input/keyboard/gpio_keys_polled.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c > index 097d721..c6dc644 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; > -- > 2.5.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-input" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c index 097d721..c6dc644 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;
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). Signed-off-by: Vincent Pelletier <plr.vincent@gmail.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> --- drivers/input/keyboard/gpio_keys_polled.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)