aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2012-11-29 11:57:17 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-11-29 12:31:26 -0500
commit1a22e16fc3d6abc8d6323cc0973435439932fe5f (patch)
treea04f5164ecdd53c5f55fb54b303e765ee5c566e5
parent16ff7cb1848a8898ff19f77b4a9632a73ff98457 (diff)
Input: gpio-keys-polled - honor 'autorepeat' setting in platform data
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/keyboard/gpio_keys_polled.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index 32e508781ddc..d72d0e5ebb85 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -245,7 +245,6 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
245 245
246 input = poll_dev->input; 246 input = poll_dev->input;
247 247
248 input->evbit[0] = BIT(EV_KEY);
249 input->name = pdev->name; 248 input->name = pdev->name;
250 input->phys = DRV_NAME"/input0"; 249 input->phys = DRV_NAME"/input0";
251 input->dev.parent = &pdev->dev; 250 input->dev.parent = &pdev->dev;
@@ -255,6 +254,10 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
255 input->id.product = 0x0001; 254 input->id.product = 0x0001;
256 input->id.version = 0x0100; 255 input->id.version = 0x0100;
257 256
257 __set_bit(EV_KEY, input->evbit);
258 if (pdata->rep)
259 __set_bit(EV_REP, input->evbit);
260
258 for (i = 0; i < pdata->nbuttons; i++) { 261 for (i = 0; i < pdata->nbuttons; i++) {
259 struct gpio_keys_button *button = &pdata->buttons[i]; 262 struct gpio_keys_button *button = &pdata->buttons[i];
260 struct gpio_keys_button_data *bdata = &bdev->data[i]; 263 struct gpio_keys_button_data *bdata = &bdev->data[i];