From: Alexandre Pereira da Silva Date: Thu, 13 Sep 2012 04:49:26 +0000 (-0700) Subject: Input: gpio_keys_polled - fix dt pdata->nbuttons X-Git-Tag: v3.7-rc4~7^2~8^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8757145af0cc7d51dc4d491c9a2248ece50b9932;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git Input: gpio_keys_polled - fix dt pdata->nbuttons pdata->nbuttons should be updated by the dt code. Signed-off-by: Alexandre Pereira da Silva Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c index 7908952..f2142de 100644 --- a/drivers/input/keyboard/gpio_keys_polled.c +++ b/drivers/input/keyboard/gpio_keys_polled.c @@ -129,6 +129,7 @@ gpio_keys_polled_get_devtree_pdata(struct device *dev) } pdata->buttons = (struct gpio_keys_button *)(pdata + 1); + pdata->nbuttons = nbuttons; pdata->rep = !!of_get_property(node, "autorepeat", NULL); of_property_read_u32(node, "poll-interval", &pdata->poll_interval);