fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / input / evdev.c

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 4bf4818..6439f37 100644 (file)
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -391,8 +391,10 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd,
        struct evdev *evdev = list->evdev;
        struct input_dev *dev = evdev->handle.dev;
        struct input_absinfo abs;
+       struct ff_effect effect;
        int __user *ip = (int __user *)p;
        int i, t, u, v;
+       int error;
 
        if (!evdev->exist)
                return -ENODEV;
@@ -460,27 +462,22 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd,
                        return 0;
 
                case EVIOCSFF:
-                       if (dev->upload_effect) {
-                               struct ff_effect effect;
-                               int err;
-
-                               if (copy_from_user(&effect, p, sizeof(effect)))
-                                       return -EFAULT;
-                               err = dev->upload_effect(dev, &effect);
-                               if (put_user(effect.id, &(((struct ff_effect __user *)p)->id)))
-                                       return -EFAULT;
-                               return err;
-                       } else
-                               return -ENOSYS;
+                       if (copy_from_user(&effect, p, sizeof(effect)))
+                               return -EFAULT;
 
-               case EVIOCRMFF:
-                       if (!dev->erase_effect)
-                               return -ENOSYS;
+                       error = input_ff_upload(dev, &effect, file);
 
-                       return dev->erase_effect(dev, (int)(unsigned long) p);
+                       if (put_user(effect.id, &(((struct ff_effect __user *)p)->id)))
+                               return -EFAULT;
+
+                       return error;
+
+               case EVIOCRMFF:
+                       return input_ff_erase(dev, (int)(unsigned long) p, file);
 
                case EVIOCGEFFECTS:
-                       if (put_user(dev->ff_effects_max, ip))
+                       i = test_bit(EV_FF, dev->evbit) ? dev->ff->max_effects : 0;
+                       if (put_user(i, ip))
                                return -EFAULT;
                        return 0;
 
@@ -604,7 +601,7 @@ static long evdev_ioctl_compat(struct file *file, unsigned int cmd, unsigned lon
 }
 #endif
 
-static struct file_operations evdev_fops = {
+static const struct file_operations evdev_fops = {
        .owner =        THIS_MODULE,
        .read =         evdev_read,
        .write =        evdev_write,
@@ -619,7 +616,8 @@ static struct file_operations evdev_fops = {
        .flush =        evdev_flush
 };
 
-static struct input_handle *evdev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)
+static struct input_handle *evdev_connect(struct input_handler *handler, struct input_dev *dev,
+                                         const struct input_device_id *id)
 {
        struct evdev *evdev;
        struct class_device *cdev;
@@ -669,6 +667,7 @@ static void evdev_disconnect(struct input_handle *handle)
        evdev->exist = 0;
 
        if (evdev->open) {
+               input_flush_device(handle, NULL);
                input_close_device(handle);
                wake_up_interruptible(&evdev->wait);
                list_for_each_entry(list, &evdev->list, node)
@@ -677,7 +676,7 @@ static void evdev_disconnect(struct input_handle *handle)
                evdev_free(evdev);
 }
 
-static struct input_device_id evdev_ids[] = {
+static const struct input_device_id evdev_ids[] = {
        { .driver_info = 1 },   /* Matches all devices */
        { },                    /* Terminating zero entry */
 };
@@ -696,8 +695,7 @@ static struct input_handler evdev_handler = {
 
 static int __init evdev_init(void)
 {
-       input_register_handler(&evdev_handler);
-       return 0;
+       return input_register_handler(&evdev_handler);
 }
 
 static void __exit evdev_exit(void)