diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-27 20:33:20 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-27 20:33:20 -0500 |
| commit | 5c461b913a16aed8afa285a1d00414791a9afe33 (patch) | |
| tree | 95c7d32fcb899240e8bc5ab5bfac20d259a81b46 /drivers/input/evdev.c | |
| parent | ef11e701f32fb0cd5c5f0f6fb9a9e28fab151219 (diff) | |
| parent | 4f56ce929cab45a3a6e1a81700da52bb9bdbfc0f (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 17660b1c8591..f8635b7b4295 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
| @@ -678,6 +678,10 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, | |||
| 678 | #define EVIOC_MASK_SIZE(nr) ((nr) & ~(_IOC_SIZEMASK << _IOC_SIZESHIFT)) | 678 | #define EVIOC_MASK_SIZE(nr) ((nr) & ~(_IOC_SIZEMASK << _IOC_SIZESHIFT)) |
| 679 | switch (EVIOC_MASK_SIZE(cmd)) { | 679 | switch (EVIOC_MASK_SIZE(cmd)) { |
| 680 | 680 | ||
| 681 | case EVIOCGPROP(0): | ||
| 682 | return bits_to_user(dev->propbit, INPUT_PROP_MAX, | ||
| 683 | size, p, compat_mode); | ||
| 684 | |||
| 681 | case EVIOCGKEY(0): | 685 | case EVIOCGKEY(0): |
| 682 | return bits_to_user(dev->key, KEY_MAX, size, p, compat_mode); | 686 | return bits_to_user(dev->key, KEY_MAX, size, p, compat_mode); |
| 683 | 687 | ||