diff --git a/[refs] b/[refs]
index 882cb8cd4b00..961e98fc8289 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caaa357dc0582f0d4504c22f1ef2347ad940de1b
+refs/heads/master: 8757145af0cc7d51dc4d491c9a2248ece50b9932
diff --git a/trunk/drivers/input/keyboard/gpio_keys_polled.c b/trunk/drivers/input/keyboard/gpio_keys_polled.c
index 790895206212..f2142de789e7 100644
--- a/trunk/drivers/input/keyboard/gpio_keys_polled.c
+++ b/trunk/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);