diff options
| author | John Stultz <john.stultz@linaro.org> | 2016-02-10 13:44:02 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-02-16 13:43:12 -0800 |
| commit | f782fceab8533f3f3d279c35a9ce485eb97b766b (patch) | |
| tree | ca7a47ea29565ee0e85b1f5ff450e5f23b3a38c9 | |
| parent | 531da993f1bf68fbd81d27c5d2ac98be77b6d256 (diff) | |
| download | common-experimental/android-4.4.tar.gz | |
Revert "HACK: input: evdev: disable EVIOCREVOKE"experimental/android-4.4
This reverts commit 63995f379914bf529df9c429598e010144912bfd.
With the EVIOCSSUSPENDBLOCK ioctl patch dropped, there isn't
the need to disable EVIOCREVOKE anymore.
Change-Id: I2803b029170e249d6034539516a8adc40f026439
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | drivers/input/evdev.c | 13 | ||||
| -rw-r--r-- | include/uapi/linux/input.h | 4 |
2 files changed, 2 insertions, 15 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 43e1a8254930..e9ae3d500a55 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -970,11 +970,6 @@ static int evdev_handle_mt_request(struct input_dev *dev, return 0; } -/* - * HACK: disable conflicting EVIOCREVOKE until Android userspace stops using - * EVIOCSSUSPENDBLOCK - */ -/* static int evdev_revoke(struct evdev *evdev, struct evdev_client *client, struct file *file) { @@ -985,7 +980,6 @@ static int evdev_revoke(struct evdev *evdev, struct evdev_client *client, return 0; } -*/ /* must be called with evdev-mutex held */ static int evdev_set_mask(struct evdev_client *client, @@ -1125,17 +1119,12 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, else return evdev_ungrab(evdev, client); - /* - * HACK: disable conflicting EVIOCREVOKE until Android userspace stops - * using EVIOCSSUSPENDBLOCK - */ - /* case EVIOCREVOKE: if (p) return -EINVAL; else return evdev_revoke(evdev, client, file); - */ + case EVIOCGMASK: { void __user *codes_ptr; diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index e5e2683337fd..2758687300b4 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -159,9 +159,7 @@ struct input_mask { #define EVIOCGEFFECTS _IOR('E', 0x84, int) /* Report number of effects playable at the same time */ #define EVIOCGRAB _IOW('E', 0x90, int) /* Grab/Release device */ - -/* HACK: disable conflicting EVIOCREVOKE until Android userspace stops using EVIOCSSUSPENDBLOCK */ -/*#define EVIOCREVOKE _IOW('E', 0x91, int)*/ /* Revoke device access */ +#define EVIOCREVOKE _IOW('E', 0x91, int) /* Revoke device access */ /** * EVIOCGMASK - Retrieve current event mask |