fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / drivers / input / misc / uinput.c
index 477579b..9516439 100644 (file)
  * Author: Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org>
  *
  * Changes/Revisions:
+ *     0.3     09/04/2006 (Anssi Hannula <anssi.hannula@gmail.com>)
+ *             - updated ff support for the changes in kernel interface
+ *             - added MODULE_VERSION
+ *     0.2     16/10/2004 (Micah Dowty <micah@navi.cx>)
+ *             - added force feedback support
+ *              - added UI_SET_PHYS
  *     0.1     20/06/2002
  *             - first public version
  */
 #include <linux/miscdevice.h>
 #include <linux/uinput.h>
 
-static int uinput_dev_open(struct input_dev *dev)
-{
-       return 0;
-}
-
-static void uinput_dev_close(struct input_dev *dev)
-{
-
-}
-
 static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
        struct uinput_device    *udev;
 
-       udev = (struct uinput_device *)dev->private;
+       udev = dev->private;
 
        udev->buff[udev->head].type = type;
        udev->buff[udev->head].code = code;
@@ -60,77 +56,184 @@ static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned i
        return 0;
 }
 
-static int uinput_dev_upload_effect(struct input_dev *dev, struct ff_effect *effect)
+static int uinput_request_alloc_id(struct uinput_device *udev, struct uinput_request *request)
 {
-       return 0;
+       /* Atomically allocate an ID for the given request. Returns 0 on success. */
+       int id;
+       int err = -1;
+
+       spin_lock(&udev->requests_lock);
+
+       for (id = 0; id < UINPUT_NUM_REQUESTS; id++)
+               if (!udev->requests[id]) {
+                       request->id = id;
+                       udev->requests[id] = request;
+                       err = 0;
+                       break;
+               }
+
+       spin_unlock(&udev->requests_lock);
+       return err;
 }
 
-static int uinput_dev_erase_effect(struct input_dev *dev, int effect_id)
+static struct uinput_request* uinput_request_find(struct uinput_device *udev, int id)
 {
-       return 0;
+       /* Find an input request, by ID. Returns NULL if the ID isn't valid. */
+       if (id >= UINPUT_NUM_REQUESTS || id < 0)
+               return NULL;
+       return udev->requests[id];
 }
 
-static int uinput_create_device(struct uinput_device *udev)
+static inline int uinput_request_reserve_slot(struct uinput_device *udev, struct uinput_request *request)
 {
-       if (!udev->dev->name) {
-               printk(KERN_DEBUG "%s: write device info first\n", UINPUT_NAME);
-               return -EINVAL;
-       }
+       /* Allocate slot. If none are available right away, wait. */
+       return wait_event_interruptible(udev->requests_waitq,
+                                       !uinput_request_alloc_id(udev, request));
+}
 
-       udev->dev->open = uinput_dev_open;
-       udev->dev->close = uinput_dev_close;
-       udev->dev->event = uinput_dev_event;
-       udev->dev->upload_effect = uinput_dev_upload_effect;
-       udev->dev->erase_effect = uinput_dev_erase_effect;
-       udev->dev->private = udev;
+static void uinput_request_done(struct uinput_device *udev, struct uinput_request *request)
+{
+       /* Mark slot as available */
+       udev->requests[request->id] = NULL;
+       wake_up(&udev->requests_waitq);
 
-       init_waitqueue_head(&(udev->waitq));
+       complete(&request->done);
+}
 
-       input_register_device(udev->dev);
+static int uinput_request_submit(struct input_dev *dev, struct uinput_request *request)
+{
+       /* Tell our userspace app about this new request by queueing an input event */
+       uinput_dev_event(dev, EV_UINPUT, request->code, request->id);
 
-       set_bit(UIST_CREATED, &(udev->state));
+       /* Wait for the request to complete */
+       wait_for_completion(&request->done);
+       return request->retval;
+}
 
-       return 0;
+static void uinput_dev_set_gain(struct input_dev *dev, u16 gain)
+{
+       uinput_dev_event(dev, EV_FF, FF_GAIN, gain);
+}
+
+static void uinput_dev_set_autocenter(struct input_dev *dev, u16 magnitude)
+{
+       uinput_dev_event(dev, EV_FF, FF_AUTOCENTER, magnitude);
 }
 
-static int uinput_destroy_device(struct uinput_device *udev)
+static int uinput_dev_playback(struct input_dev *dev, int effect_id, int value)
 {
-       if (!test_bit(UIST_CREATED, &(udev->state))) {
-               printk(KERN_WARNING "%s: create the device first\n", UINPUT_NAME);
+       return uinput_dev_event(dev, EV_FF, effect_id, value);
+}
+
+static int uinput_dev_upload_effect(struct input_dev *dev, struct ff_effect *effect, struct ff_effect *old)
+{
+       struct uinput_request request;
+       int retval;
+
+       request.id = -1;
+       init_completion(&request.done);
+       request.code = UI_FF_UPLOAD;
+       request.u.upload.effect = effect;
+       request.u.upload.old = old;
+
+       retval = uinput_request_reserve_slot(dev->private, &request);
+       if (!retval)
+               retval = uinput_request_submit(dev, &request);
+
+       return retval;
+}
+
+static int uinput_dev_erase_effect(struct input_dev *dev, int effect_id)
+{
+       struct uinput_request request;
+       int retval;
+
+       if (!test_bit(EV_FF, dev->evbit))
+               return -ENOSYS;
+
+       request.id = -1;
+       init_completion(&request.done);
+       request.code = UI_FF_ERASE;
+       request.u.effect_id = effect_id;
+
+       retval = uinput_request_reserve_slot(dev->private, &request);
+       if (!retval)
+               retval = uinput_request_submit(dev, &request);
+
+       return retval;
+}
+
+static void uinput_destroy_device(struct uinput_device *udev)
+{
+       const char *name, *phys;
+
+       if (udev->dev) {
+               name = udev->dev->name;
+               phys = udev->dev->phys;
+               if (udev->state == UIST_CREATED)
+                       input_unregister_device(udev->dev);
+               else
+                       input_free_device(udev->dev);
+               kfree(name);
+               kfree(phys);
+               udev->dev = NULL;
+       }
+
+       udev->state = UIST_NEW_DEVICE;
+}
+
+static int uinput_create_device(struct uinput_device *udev)
+{
+       struct input_dev *dev = udev->dev;
+       int error;
+
+       if (udev->state != UIST_SETUP_COMPLETE) {
+               printk(KERN_DEBUG "%s: write device info first\n", UINPUT_NAME);
                return -EINVAL;
        }
 
-       input_unregister_device(udev->dev);
+       if (udev->ff_effects_max) {
+               error = input_ff_create(dev, udev->ff_effects_max);
+               if (error)
+                       goto fail1;
+
+               dev->ff->upload = uinput_dev_upload_effect;
+               dev->ff->erase = uinput_dev_erase_effect;
+               dev->ff->playback = uinput_dev_playback;
+               dev->ff->set_gain = uinput_dev_set_gain;
+               dev->ff->set_autocenter = uinput_dev_set_autocenter;
+       }
 
-       clear_bit(UIST_CREATED, &(udev->state));
+       error = input_register_device(udev->dev);
+       if (error)
+               goto fail2;
+
+       udev->state = UIST_CREATED;
 
        return 0;
+
+ fail2:        input_ff_destroy(dev);
+ fail1: uinput_destroy_device(udev);
+       return error;
 }
 
 static int uinput_open(struct inode *inode, struct file *file)
 {
-       struct uinput_device    *newdev;
-       struct input_dev        *newinput;
+       struct uinput_device *newdev;
 
-       newdev = kmalloc(sizeof(struct uinput_device), GFP_KERNEL);
+       newdev = kzalloc(sizeof(struct uinput_device), GFP_KERNEL);
        if (!newdev)
-               goto error;
-       memset(newdev, 0, sizeof(struct uinput_device));
+               return -ENOMEM;
 
-       newinput = kmalloc(sizeof(struct input_dev), GFP_KERNEL);
-       if (!newinput)
-               goto cleanup;
-       memset(newinput, 0, sizeof(struct input_dev));
-
-       newdev->dev = newinput;
+       mutex_init(&newdev->mutex);
+       spin_lock_init(&newdev->requests_lock);
+       init_waitqueue_head(&newdev->requests_waitq);
+       init_waitqueue_head(&newdev->waitq);
+       newdev->state = UIST_NEW_DEVICE;
 
        file->private_data = newdev;
 
        return 0;
-cleanup:
-       kfree(newdev);
-error:
-       return -ENOMEM;
 }
 
 static int uinput_validate_absbits(struct input_dev *dev)
@@ -138,12 +241,11 @@ static int uinput_validate_absbits(struct input_dev *dev)
        unsigned int cnt;
        int retval = 0;
 
-       for (cnt = 0; cnt < ABS_MAX; cnt++) {
+       for (cnt = 0; cnt < ABS_MAX + 1; cnt++) {
                if (!test_bit(cnt, dev->absbit))
                        continue;
 
-               if (/*!dev->absmin[cnt] || !dev->absmax[cnt] || */
-                   (dev->absmax[cnt] <= dev->absmin[cnt])) {
+               if ((dev->absmax[cnt] <= dev->absmin[cnt])) {
                        printk(KERN_DEBUG
                                "%s: invalid abs[%02x] min:%d max:%d\n",
                                UINPUT_NAME, cnt,
@@ -152,8 +254,7 @@ static int uinput_validate_absbits(struct input_dev *dev)
                        break;
                }
 
-               if ((dev->absflat[cnt] < dev->absmin[cnt]) ||
-                   (dev->absflat[cnt] > dev->absmax[cnt])) {
+               if (dev->absflat[cnt] > (dev->absmax[cnt] - dev->absmin[cnt])) {
                        printk(KERN_DEBUG
                                "%s: absflat[%02x] out of range: %d "
                                "(min:%d/max:%d)\n",
@@ -166,46 +267,66 @@ static int uinput_validate_absbits(struct input_dev *dev)
        return retval;
 }
 
-static int uinput_alloc_device(struct file *file, const char __user *buffer, size_t count)
+static int uinput_allocate_device(struct uinput_device *udev)
+{
+       udev->dev = input_allocate_device();
+       if (!udev->dev)
+               return -ENOMEM;
+
+       udev->dev->event = uinput_dev_event;
+       udev->dev->private = udev;
+
+       return 0;
+}
+
+static int uinput_setup_device(struct uinput_device *udev, const char __user *buffer, size_t count)
 {
        struct uinput_user_dev  *user_dev;
        struct input_dev        *dev;
-       struct uinput_device    *udev;
-       int                     size,
-                               retval;
+       char                    *name;
+       int                     size;
+       int                     retval;
 
-       retval = count;
+       if (count != sizeof(struct uinput_user_dev))
+               return -EINVAL;
+
+       if (!udev->dev) {
+               retval = uinput_allocate_device(udev);
+               if (retval)
+                       return retval;
+       }
 
-       udev = (struct uinput_device *)file->private_data;
        dev = udev->dev;
 
-       user_dev = kmalloc(sizeof(*user_dev), GFP_KERNEL);
-       if (!user_dev) {
-               retval = -ENOMEM;
-               goto exit;
-       }
+       user_dev = kmalloc(sizeof(struct uinput_user_dev), GFP_KERNEL);
+       if (!user_dev)
+               return -ENOMEM;
 
        if (copy_from_user(user_dev, buffer, sizeof(struct uinput_user_dev))) {
                retval = -EFAULT;
                goto exit;
        }
 
-       if (NULL != dev->name)
-               kfree(dev->name);
+       udev->ff_effects_max = user_dev->ff_effects_max;
 
        size = strnlen(user_dev->name, UINPUT_MAX_NAME_SIZE) + 1;
-       dev->name = kmalloc(size, GFP_KERNEL);
-       if (!dev->name) {
+       if (!size) {
+               retval = -EINVAL;
+               goto exit;
+       }
+
+       kfree(dev->name);
+       dev->name = name = kmalloc(size, GFP_KERNEL);
+       if (!name) {
                retval = -ENOMEM;
                goto exit;
        }
+       strlcpy(name, user_dev->name, size);
 
-       strlcpy(dev->name, user_dev->name, size);
        dev->id.bustype = user_dev->id.bustype;
        dev->id.vendor  = user_dev->id.vendor;
        dev->id.product = user_dev->id.product;
        dev->id.version = user_dev->id.version;
-       dev->ff_effects_max = user_dev->ff_effects_max;
 
        size = sizeof(int) * (ABS_MAX + 1);
        memcpy(dev->absmax, user_dev->absmax, size);
@@ -218,29 +339,48 @@ static int uinput_alloc_device(struct file *file, const char __user *buffer, siz
        if (test_bit(EV_ABS, dev->evbit)) {
                retval = uinput_validate_absbits(dev);
                if (retval < 0)
-                       kfree(dev->name);
+                       goto exit;
        }
 
-exit:
+       udev->state = UIST_SETUP_COMPLETE;
+       retval = count;
+
+ exit:
        kfree(user_dev);
        return retval;
 }
 
+static inline ssize_t uinput_inject_event(struct uinput_device *udev, const char __user *buffer, size_t count)
+{
+       struct input_event ev;
+
+       if (count != sizeof(struct input_event))
+               return -EINVAL;
+
+       if (copy_from_user(&ev, buffer, sizeof(struct input_event)))
+               return -EFAULT;
+
+       input_event(udev->dev, ev.type, ev.code, ev.value);
+
+       return sizeof(struct input_event);
+}
+
 static ssize_t uinput_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
 {
-       struct uinput_device    *udev = file->private_data;
+       struct uinput_device *udev = file->private_data;
+       int retval;
 
-       if (test_bit(UIST_CREATED, &(udev->state))) {
-               struct input_event      ev;
+       retval = mutex_lock_interruptible(&udev->mutex);
+       if (retval)
+               return retval;
 
-               if (copy_from_user(&ev, buffer, sizeof(struct input_event)))
-                       return -EFAULT;
-               input_event(udev->dev, ev.type, ev.code, ev.value);
-       }
-       else
-               count = uinput_alloc_device(file, buffer, count);
+       retval = udev->state == UIST_CREATED ?
+                       uinput_inject_event(udev, buffer, count) :
+                       uinput_setup_device(udev, buffer, count);
 
-       return count;
+       mutex_unlock(&udev->mutex);
+
+       return retval;
 }
 
 static ssize_t uinput_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
@@ -248,30 +388,38 @@ static ssize_t uinput_read(struct file *file, char __user *buffer, size_t count,
        struct uinput_device *udev = file->private_data;
        int retval = 0;
 
-       if (!test_bit(UIST_CREATED, &(udev->state)))
+       if (udev->state != UIST_CREATED)
                return -ENODEV;
 
-       if ((udev->head == udev->tail) && (file->f_flags & O_NONBLOCK))
+       if (udev->head == udev->tail && (file->f_flags & O_NONBLOCK))
                return -EAGAIN;
 
        retval = wait_event_interruptible(udev->waitq,
-                       (udev->head != udev->tail) ||
-                       !test_bit(UIST_CREATED, &(udev->state)));
+                       udev->head != udev->tail || udev->state != UIST_CREATED);
+       if (retval)
+               return retval;
 
+       retval = mutex_lock_interruptible(&udev->mutex);
        if (retval)
                return retval;
 
-       if (!test_bit(UIST_CREATED, &(udev->state)))
-               return -ENODEV;
+       if (udev->state != UIST_CREATED) {
+               retval = -ENODEV;
+               goto out;
+       }
 
-       while ((udev->head != udev->tail) &&
-           (retval + sizeof(struct input_event) <= count)) {
-               if (copy_to_user(buffer + retval, &(udev->buff[udev->tail]),
-                   sizeof(struct input_event))) return -EFAULT;
+       while (udev->head != udev->tail && retval + sizeof(struct input_event) <= count) {
+               if (copy_to_user(buffer + retval, &udev->buff[udev->tail], sizeof(struct input_event))) {
+                       retval = -EFAULT;
+                       goto out;
+               }
                udev->tail = (udev->tail + 1) % UINPUT_BUFFER_SIZE;
                retval += sizeof(struct input_event);
        }
 
+ out:
+       mutex_unlock(&udev->mutex);
+
        return retval;
 }
 
@@ -279,9 +427,6 @@ static unsigned int uinput_poll(struct file *file, poll_table *wait)
 {
        struct uinput_device *udev = file->private_data;
 
-       if (!test_bit(UIST_CREATED, &(udev->state)))
-               return 0;
-
        poll_wait(file, &udev->waitq, wait);
 
        if (udev->head != udev->tail)
@@ -290,32 +435,49 @@ static unsigned int uinput_poll(struct file *file, poll_table *wait)
        return 0;
 }
 
-static int uinput_burn_device(struct uinput_device *udev)
+static int uinput_release(struct inode *inode, struct file *file)
 {
-       if (test_bit(UIST_CREATED, &(udev->state)))
-               uinput_destroy_device(udev);
+       struct uinput_device *udev = file->private_data;
 
-       kfree(udev->dev);
+       uinput_destroy_device(udev);
        kfree(udev);
 
        return 0;
 }
 
-static int uinput_close(struct inode *inode, struct file *file)
-{
-       return uinput_burn_device((struct uinput_device *)file->private_data);
-}
-
-static int uinput_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+#define uinput_set_bit(_arg, _bit, _max)               \
+({                                                     \
+       int __ret = 0;                                  \
+       if (udev->state == UIST_CREATED)                \
+               __ret =  -EINVAL;                       \
+       else if ((_arg) > (_max))                       \
+               __ret = -EINVAL;                        \
+       else set_bit((_arg), udev->dev->_bit);          \
+       __ret;                                          \
+})
+
+static long uinput_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-       int                     retval = 0;
+       int                     retval;
        struct uinput_device    *udev;
+       void __user             *p = (void __user *)arg;
+       struct uinput_ff_upload ff_up;
+       struct uinput_ff_erase  ff_erase;
+       struct uinput_request   *req;
+       int                     length;
+       char                    *phys;
 
-       udev = (struct uinput_device *)file->private_data;
+       udev = file->private_data;
 
-       /* device attributes can not be changed after the device is created */
-       if (cmd >= UI_SET_EVBIT && test_bit(UIST_CREATED, &(udev->state)))
-               return -EINVAL;
+       retval = mutex_lock_interruptible(&udev->mutex);
+       if (retval)
+               return retval;
+
+       if (!udev->dev) {
+               retval = uinput_allocate_device(udev);
+               if (retval)
+                       goto out;
+       }
 
        switch (cmd) {
                case UI_DEV_CREATE:
@@ -323,93 +485,162 @@ static int uinput_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                        break;
 
                case UI_DEV_DESTROY:
-                       retval = uinput_destroy_device(udev);
+                       uinput_destroy_device(udev);
                        break;
 
                case UI_SET_EVBIT:
-                       if (arg > EV_MAX) {
-                               retval = -EINVAL;
-                               break;
-                       }
-                       set_bit(arg, udev->dev->evbit);
+                       retval = uinput_set_bit(arg, evbit, EV_MAX);
                        break;
 
                case UI_SET_KEYBIT:
-                       if (arg > KEY_MAX) {
-                               retval = -EINVAL;
-                               break;
-                       }
-                       set_bit(arg, udev->dev->keybit);
+                       retval = uinput_set_bit(arg, keybit, KEY_MAX);
                        break;
 
                case UI_SET_RELBIT:
-                       if (arg > REL_MAX) {
-                               retval = -EINVAL;
-                               break;
-                       }
-                       set_bit(arg, udev->dev->relbit);
+                       retval = uinput_set_bit(arg, relbit, REL_MAX);
                        break;
 
                case UI_SET_ABSBIT:
-                       if (arg > ABS_MAX) {
+                       retval = uinput_set_bit(arg, absbit, ABS_MAX);
+                       break;
+
+               case UI_SET_MSCBIT:
+                       retval = uinput_set_bit(arg, mscbit, MSC_MAX);
+                       break;
+
+               case UI_SET_LEDBIT:
+                       retval = uinput_set_bit(arg, ledbit, LED_MAX);
+                       break;
+
+               case UI_SET_SNDBIT:
+                       retval = uinput_set_bit(arg, sndbit, SND_MAX);
+                       break;
+
+               case UI_SET_FFBIT:
+                       retval = uinput_set_bit(arg, ffbit, FF_MAX);
+                       break;
+
+               case UI_SET_SWBIT:
+                       retval = uinput_set_bit(arg, swbit, SW_MAX);
+                       break;
+
+               case UI_SET_PHYS:
+                       if (udev->state == UIST_CREATED) {
                                retval = -EINVAL;
+                               goto out;
+                       }
+                       length = strnlen_user(p, 1024);
+                       if (length <= 0) {
+                               retval = -EFAULT;
                                break;
                        }
-                       set_bit(arg, udev->dev->absbit);
+                       kfree(udev->dev->phys);
+                       udev->dev->phys = phys = kmalloc(length, GFP_KERNEL);
+                       if (!phys) {
+                               retval = -ENOMEM;
+                               break;
+                       }
+                       if (copy_from_user(phys, p, length)) {
+                               udev->dev->phys = NULL;
+                               kfree(phys);
+                               retval = -EFAULT;
+                               break;
+                       }
+                       phys[length - 1] = '\0';
                        break;
 
-               case UI_SET_MSCBIT:
-                       if (arg > MSC_MAX) {
+               case UI_BEGIN_FF_UPLOAD:
+                       if (copy_from_user(&ff_up, p, sizeof(ff_up))) {
+                               retval = -EFAULT;
+                               break;
+                       }
+                       req = uinput_request_find(udev, ff_up.request_id);
+                       if (!(req && req->code == UI_FF_UPLOAD && req->u.upload.effect)) {
                                retval = -EINVAL;
                                break;
                        }
-                       set_bit(arg, udev->dev->mscbit);
+                       ff_up.retval = 0;
+                       memcpy(&ff_up.effect, req->u.upload.effect, sizeof(struct ff_effect));
+                       if (req->u.upload.old)
+                               memcpy(&ff_up.old, req->u.upload.old, sizeof(struct ff_effect));
+                       else
+                               memset(&ff_up.old, 0, sizeof(struct ff_effect));
+
+                       if (copy_to_user(p, &ff_up, sizeof(ff_up))) {
+                               retval = -EFAULT;
+                               break;
+                       }
                        break;
 
-               case UI_SET_LEDBIT:
-                       if (arg > LED_MAX) {
+               case UI_BEGIN_FF_ERASE:
+                       if (copy_from_user(&ff_erase, p, sizeof(ff_erase))) {
+                               retval = -EFAULT;
+                               break;
+                       }
+                       req = uinput_request_find(udev, ff_erase.request_id);
+                       if (!(req && req->code == UI_FF_ERASE)) {
                                retval = -EINVAL;
                                break;
                        }
-                       set_bit(arg, udev->dev->ledbit);
+                       ff_erase.retval = 0;
+                       ff_erase.effect_id = req->u.effect_id;
+                       if (copy_to_user(p, &ff_erase, sizeof(ff_erase))) {
+                               retval = -EFAULT;
+                               break;
+                       }
                        break;
 
-               case UI_SET_SNDBIT:
-                       if (arg > SND_MAX) {
+               case UI_END_FF_UPLOAD:
+                       if (copy_from_user(&ff_up, p, sizeof(ff_up))) {
+                               retval = -EFAULT;
+                               break;
+                       }
+                       req = uinput_request_find(udev, ff_up.request_id);
+                       if (!(req && req->code == UI_FF_UPLOAD && req->u.upload.effect)) {
                                retval = -EINVAL;
                                break;
                        }
-                       set_bit(arg, udev->dev->sndbit);
+                       req->retval = ff_up.retval;
+                       uinput_request_done(udev, req);
                        break;
 
-               case UI_SET_FFBIT:
-                       if (arg > FF_MAX) {
+               case UI_END_FF_ERASE:
+                       if (copy_from_user(&ff_erase, p, sizeof(ff_erase))) {
+                               retval = -EFAULT;
+                               break;
+                       }
+                       req = uinput_request_find(udev, ff_erase.request_id);
+                       if (!(req && req->code == UI_FF_ERASE)) {
                                retval = -EINVAL;
                                break;
                        }
-                       set_bit(arg, udev->dev->ffbit);
+                       req->retval = ff_erase.retval;
+                       uinput_request_done(udev, req);
                        break;
 
                default:
-                       retval = -EFAULT;
+                       retval = -EINVAL;
        }
+
+ out:
+       mutex_unlock(&udev->mutex);
        return retval;
 }
 
-struct file_operations uinput_fops = {
-       .owner =        THIS_MODULE,
-       .open =         uinput_open,
-       .release =      uinput_close,
-       .read =         uinput_read,
-       .write =        uinput_write,
-       .poll =         uinput_poll,
-       .ioctl =        uinput_ioctl,
+static struct file_operations uinput_fops = {
+       .owner          = THIS_MODULE,
+       .open           = uinput_open,
+       .release        = uinput_release,
+       .read           = uinput_read,
+       .write          = uinput_write,
+       .poll           = uinput_poll,
+       .unlocked_ioctl = uinput_ioctl,
 };
 
 static struct miscdevice uinput_misc = {
-       .fops =         &uinput_fops,
-       .minor =        UINPUT_MINOR,
-       .name =         UINPUT_NAME,
+       .fops           = &uinput_fops,
+       .minor          = UINPUT_MINOR,
+       .name           = UINPUT_NAME,
 };
 
 static int __init uinput_init(void)
@@ -425,6 +656,7 @@ static void __exit uinput_exit(void)
 MODULE_AUTHOR("Aristeu Sergio Rozanski Filho");
 MODULE_DESCRIPTION("User level driver support for input subsystem");
 MODULE_LICENSE("GPL");
+MODULE_VERSION("0.3");
 
 module_init(uinput_init);
 module_exit(uinput_exit);