diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 21:56:19 +0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 21:56:19 +0400 |
| commit | 8ef1bb539203629f77a61976e4f25415e1083bff (patch) | |
| tree | 4fee25aca0928f112716fb02d27b1b355d0843b4 /drivers/input/keyboard/matrix_keypad.c | |
| parent | a3bcbbee83f55cbaec9b2ad748e7300c7feb2192 (diff) | |
| parent | b91ce4d14a21fc04d165be30319541e0f9204f15 (diff) | |
| download | kernel_samsung_smdk4412-8ef1bb539203629f77a61976e4f25415e1083bff.zip kernel_samsung_smdk4412-8ef1bb539203629f77a61976e4f25415e1083bff.tar.gz kernel_samsung_smdk4412-8ef1bb539203629f77a61976e4f25415e1083bff.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/input/keyboard/matrix_keypad.c')
| -rw-r--r-- | drivers/input/keyboard/matrix_keypad.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c index d3c8b61..b443e08 100644 --- a/drivers/input/keyboard/matrix_keypad.c +++ b/drivers/input/keyboard/matrix_keypad.c @@ -22,6 +22,7 @@ #include <linux/module.h> #include <linux/gpio.h> #include <linux/input/matrix_keypad.h> +#include <linux/slab.h> struct matrix_keypad { const struct matrix_keypad_platform_data *pdata; @@ -373,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; |