diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-04-14 08:21:38 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-04-14 08:21:38 +0200 |
| commit | 56f3e1c0579cd06196d51ebd1ccad9298c5426b3 (patch) | |
| tree | cacccdde5f6fb5c9e734977306fb1b73ef33ea03 /drivers/input/keyboard | |
| parent | Linux 2.6.34-rc4 (diff) | |
| parent | Input: wacom - switch mode upon system resume (diff) | |
| download | linux-56f3e1c0579cd06196d51ebd1ccad9298c5426b3.tar.xz linux-56f3e1c0579cd06196d51ebd1ccad9298c5426b3.zip | |
Merge branch 'for-linus' into next
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/matrix_keypad.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c index ffc25cfcef7a..b443e088fd3c 100644 --- a/drivers/input/keyboard/matrix_keypad.c +++ b/drivers/input/keyboard/matrix_keypad.c @@ -374,7 +374,9 @@ static int __devinit matrix_keypad_probe(struct platform_device *pdev) input_dev->name = pdev->name; input_dev->id.bustype = BUS_HOST; input_dev->dev.parent = &pdev->dev; - input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP); + input_dev->evbit[0] = BIT_MASK(EV_KEY); + if (!pdata->no_autorepeat) + input_dev->evbit[0] |= BIT_MASK(EV_REP); input_dev->open = matrix_keypad_start; input_dev->close = matrix_keypad_stop; |