[PATCH] input: gpio_keys_polled: fix dt pdata->nbuttons

Subsystems: input (keyboard, mouse, joystick, touchscreen) drivers, the rest

STALE5087d

2 messages, 2 authors, 2012-09-13 · open the first message on its own page

[PATCH] input: gpio_keys_polled: fix dt pdata->nbuttons

From: Alexandre Pereira da Silva <hidden>
Date: 2012-09-12 21:27:33

pdata->nbuttons should be updated by the dt code.

Signed-off-by: Alexandre Pereira da Silva <redacted>
---
 drivers/input/keyboard/gpio_keys_polled.c |    1 +
 1 file changed, 1 insertion(+)
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);
-- 
1.7.10

Re: [PATCH] input: gpio_keys_polled: fix dt pdata->nbuttons

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2012-09-13 04:49:42

On Wed, Sep 12, 2012 at 06:27:23PM -0300, Alexandre Pereira da Silva wrote:
pdata->nbuttons should be updated by the dt code.

Signed-off-by: Alexandre Pereira da Silva <redacted>
Applied, thank you Alexandre.
 
quoted hunk
---
 drivers/input/keyboard/gpio_keys_polled.c |    1 +
 1 file changed, 1 insertion(+)
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);
-- 
1.7.10
-- 
Dmitry
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help