HID: Do not create input devices for feature reports

[android-x86/kernel.git] / drivers / input / evdev.c

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 68f09a8..cc7380e 100644 (file)
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -8,6 +8,8 @@
  * the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define EVDEV_MINOR_BASE       64
 #define EVDEV_MINORS           32
 #define EVDEV_MIN_BUFFER_SIZE  64U
@@ -21,6 +23,7 @@
 #include <linux/input.h>
 #include <linux/major.h>
 #include <linux/device.h>
+#include <linux/wakelock.h>
 #include "input-compat.h"
 
 struct evdev {
@@ -40,6 +43,8 @@ struct evdev_client {
        int head;
        int tail;
        spinlock_t buffer_lock; /* protects access to buffer, head and tail */
+       struct wake_lock wake_lock;
+       char name[28];
        struct fasync_struct *fasync;
        struct evdev *evdev;
        struct list_head node;
@@ -59,6 +64,7 @@ static void evdev_pass_event(struct evdev_client *client,
         * "empty" by having client->head == client->tail.
         */
        spin_lock(&client->buffer_lock);
+       wake_lock_timeout(&client->wake_lock, 5 * HZ);
        do {
                client->buffer[client->head++] = *event;
                client->head &= client->bufsize - 1;
@@ -78,8 +84,11 @@ static void evdev_event(struct input_handle *handle,
        struct evdev *evdev = handle->private;
        struct evdev_client *client;
        struct input_event event;
+       struct timespec ts;
 
-       do_gettimeofday(&event.time);
+       ktime_get_ts(&ts);
+       event.time.tv_sec = ts.tv_sec;
+       event.time.tv_usec = ts.tv_nsec / NSEC_PER_USEC;
        event.type = type;
        event.code = code;
        event.value = value;
@@ -240,6 +249,7 @@ static int evdev_release(struct inode *inode, struct file *file)
        mutex_unlock(&evdev->mutex);
 
        evdev_detach_client(evdev, client);
+       wake_lock_destroy(&client->wake_lock);
        kfree(client);
 
        evdev_close_device(evdev);
@@ -291,6 +301,9 @@ static int evdev_open(struct inode *inode, struct file *file)
 
        client->bufsize = bufsize;
        spin_lock_init(&client->buffer_lock);
+       snprintf(client->name, sizeof(client->name), "%s-%d",
+                       dev_name(&evdev->dev), task_tgid_vnr(current));
+       wake_lock_init(&client->wake_lock, WAKE_LOCK_SUSPEND, client->name);
        client->evdev = evdev;
        evdev_attach_client(evdev, client);
 
@@ -305,6 +318,7 @@ static int evdev_open(struct inode *inode, struct file *file)
 
  err_free_client:
        evdev_detach_client(evdev, client);
+       wake_lock_destroy(&client->wake_lock);
        kfree(client);
  err_put_evdev:
        put_device(&evdev->dev);
@@ -356,6 +370,8 @@ static int evdev_fetch_next_event(struct evdev_client *client,
        if (have_event) {
                *event = client->buffer[client->tail++];
                client->tail &= client->bufsize - 1;
+               if (client->head == client->tail)
+                       wake_unlock(&client->wake_lock);
        }
 
        spin_unlock_irq(&client->buffer_lock);
@@ -522,12 +538,11 @@ static int handle_eviocgbit(struct input_dev *dev,
        if (type == EV_KEY && size == OLD_KEY_MAX) {
                len = OLD_KEY_MAX;
                if (printk_timed_ratelimit(&keymax_warn_time, 10 * 1000))
-                       printk(KERN_WARNING
-                               "evdev.c(EVIOCGBIT): Suspicious buffer size %u, "
-                               "limiting output to %zu bytes. See "
-                               "http://userweb.kernel.org/~dtor/eviocgbit-bug.html\n",
-                               OLD_KEY_MAX,
-                               BITS_TO_LONGS(OLD_KEY_MAX) * sizeof(long));
+                       pr_warning("(EVIOCGBIT): Suspicious buffer size %u, "
+                                  "limiting output to %zu bytes. See "
+                                  "http://userweb.kernel.org/~dtor/eviocgbit-bug.html\n",
+                                  OLD_KEY_MAX,
+                                  BITS_TO_LONGS(OLD_KEY_MAX) * sizeof(long));
        }
 
        return bits_to_user(bits, len, size, p, compat_mode);
@@ -686,6 +701,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);
 
@@ -897,7 +916,7 @@ static int evdev_connect(struct input_handler *handler, struct input_dev *dev,
                        break;
 
        if (minor == EVDEV_MINORS) {
-               printk(KERN_ERR "evdev: no more free evdev devices\n");
+               pr_err("no more free evdev devices\n");
                return -ENFILE;
        }