aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorAlexandre Pereira da Silva <aletes.xgr@gmail.com>2012-09-13 00:49:26 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-09-13 00:56:20 -0400
commit8757145af0cc7d51dc4d491c9a2248ece50b9932 (patch)
tree1b48505b5324f62b8c9e01c1e94b74086f02d9df /drivers/input
parentcaaa357dc0582f0d4504c22f1ef2347ad940de1b (diff)
Input: gpio_keys_polled - fix dt pdata->nbuttons
pdata->nbuttons should be updated by the dt code. Signed-off-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/gpio_keys_polled.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index 790895206212..f2142de789e7 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)
129 } 129 }
130 130
131 pdata->buttons = (struct gpio_keys_button *)(pdata + 1); 131 pdata->buttons = (struct gpio_keys_button *)(pdata + 1);
132 pdata->nbuttons = nbuttons;
132 133
133 pdata->rep = !!of_get_property(node, "autorepeat", NULL); 134 pdata->rep = !!of_get_property(node, "autorepeat", NULL);
134 of_property_read_u32(node, "poll-interval", &pdata->poll_interval); 135 of_property_read_u32(node, "poll-interval", &pdata->poll_interval);