aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/input.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-19 13:31:04 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-19 13:31:04 -0500
commit864ee6cb22fd64c1f4fba8ea3f390ffd8816b563 (patch)
tree74e41ec9b5ceb47ab9d704ece42d603df390370c /drivers/input/input.c
parent973d168de251d46605dc00d2c7f83848a5af9fb9 (diff)
parentde391d12500ede13faa7ecadbe900a8de1f76cfa (diff)
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 90b7ecfb6257..db409d6bd5d2 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -752,7 +752,7 @@ static int input_default_setkeycode(struct input_dev *dev,
752 if (index >= dev->keycodemax) 752 if (index >= dev->keycodemax)
753 return -EINVAL; 753 return -EINVAL;
754 754
755 if (dev->keycodesize < sizeof(dev->keycode) && 755 if (dev->keycodesize < sizeof(ke->keycode) &&
756 (ke->keycode >> (dev->keycodesize * 8))) 756 (ke->keycode >> (dev->keycodesize * 8)))
757 return -EINVAL; 757 return -EINVAL;
758 758