summaryrefslogtreecommitdiffstats
path: root/drivers/input/evdev.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-12-27 17:33:20 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-12-27 17:33:20 -0800
commit5c461b913a16aed8afa285a1d00414791a9afe33 (patch)
tree95c7d32fcb899240e8bc5ab5bfac20d259a81b46 /drivers/input/evdev.c
parentef11e701f32fb0cd5c5f0f6fb9a9e28fab151219 (diff)
parent4f56ce929cab45a3a6e1a81700da52bb9bdbfc0f (diff)
downloadop-kernel-dev-5c461b913a16aed8afa285a1d00414791a9afe33.zip
op-kernel-dev-5c461b913a16aed8afa285a1d00414791a9afe33.tar.gz
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.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 17660b1..f8635b7 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,
#define EVIOC_MASK_SIZE(nr) ((nr) & ~(_IOC_SIZEMASK << _IOC_SIZESHIFT))
switch (EVIOC_MASK_SIZE(cmd)) {
+ case EVIOCGPROP(0):
+ return bits_to_user(dev->propbit, INPUT_PROP_MAX,
+ size, p, compat_mode);
+
case EVIOCGKEY(0):
return bits_to_user(dev->key, KEY_MAX, size, p, compat_mode);
OpenPOWER on IntegriCloud