summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorAlexandre Pereira da Silva <aletes.xgr@gmail.com>2012-09-12 21:49:26 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-09-12 21:56:20 -0700
commit8757145af0cc7d51dc4d491c9a2248ece50b9932 (patch)
tree1b48505b5324f62b8c9e01c1e94b74086f02d9df /drivers/input
parentcaaa357dc0582f0d4504c22f1ef2347ad940de1b (diff)
downloadop-kernel-dev-8757145af0cc7d51dc4d491c9a2248ece50b9932.zip
op-kernel-dev-8757145af0cc7d51dc4d491c9a2248ece50b9932.tar.gz
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 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);
OpenPOWER on IntegriCloud