diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-19 10:31:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-19 10:31:04 -0800 |
| commit | 864ee6cb22fd64c1f4fba8ea3f390ffd8816b563 (patch) | |
| tree | 74e41ec9b5ceb47ab9d704ece42d603df390370c /drivers/input/input.c | |
| parent | 973d168de251d46605dc00d2c7f83848a5af9fb9 (diff) | |
| parent | de391d12500ede13faa7ecadbe900a8de1f76cfa (diff) | |
| download | linux-864ee6cb22fd64c1f4fba8ea3f390ffd8816b563.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: fix typo in keycode validation supporting large scancodes
Input: aiptek - tighten up permissions on sysfs attributes
Input: sysrq - pass along lone Alt + SysRq
Diffstat (limited to 'drivers/input/input.c')
| -rw-r--r-- | drivers/input/input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index 90b7ecfb625757..db409d6bd5d2b9 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -752,7 +752,7 @@ static int input_default_setkeycode(struct input_dev *dev, if (index >= dev->keycodemax) return -EINVAL; - if (dev->keycodesize < sizeof(dev->keycode) && + if (dev->keycodesize < sizeof(ke->keycode) && (ke->keycode >> (dev->keycodesize * 8))) return -EINVAL; |