HID: force hiddev creation for SONY PS3 controller

[linux-2.6-omap-h63xx.git] / drivers / hid / usbhid / hiddev.c

diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index a8b3d66cd4988b6f133f8804de4a643faeabacc3..5fc4019956ba2ffe17b2d5dda04206aa7b5d9a4d 100644 (file)
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -34,6 +34,7 @@
 #include <linux/usb.h>
 #include <linux/hid.h>
 #include <linux/hiddev.h>
+#include <linux/compat.h>
 #include "usbhid.h"
 
 #ifdef CONFIG_USB_DYNAMIC_MINORS
@@ -51,6 +52,7 @@ struct hiddev {
        wait_queue_head_t wait;
        struct hid_device *hid;
        struct list_head list;
+       spinlock_t list_lock;
 };
 
 struct hiddev_list {
@@ -161,7 +163,9 @@ static void hiddev_send_event(struct hid_device *hid,
 {
        struct hiddev *hiddev = hid->hiddev;
        struct hiddev_list *list;
+       unsigned long flags;
 
+       spin_lock_irqsave(&hiddev->list_lock, flags);
        list_for_each_entry(list, &hiddev->list, node) {
                if (uref->field_index != HID_FIELD_INDEX_NONE ||
                    (list->flags & HIDDEV_FLAG_REPORT) != 0) {
@@ -171,6 +175,7 @@ static void hiddev_send_event(struct hid_device *hid,
                        kill_fasync(&list->fasync, SIGIO, POLL_IN);
                }
        }
+       spin_unlock_irqrestore(&hiddev->list_lock, flags);
 
        wake_up_interruptible(&hiddev->wait);
 }
@@ -235,9 +240,13 @@ static int hiddev_fasync(int fd, struct file *file, int on)
 static int hiddev_release(struct inode * inode, struct file * file)
 {
        struct hiddev_list *list = file->private_data;
+       unsigned long flags;
 
        hiddev_fasync(-1, file, 0);
+
+       spin_lock_irqsave(&list->hiddev->list_lock, flags);
        list_del(&list->node);
+       spin_unlock_irqrestore(&list->hiddev->list_lock, flags);
 
        if (!--list->hiddev->open) {
                if (list->hiddev->exist)
@@ -257,6 +266,7 @@ static int hiddev_release(struct inode * inode, struct file * file)
 static int hiddev_open(struct inode *inode, struct file *file)
 {
        struct hiddev_list *list;
+       unsigned long flags;
 
        int i = iminor(inode) - HIDDEV_MINOR_BASE;
 
@@ -267,7 +277,11 @@ static int hiddev_open(struct inode *inode, struct file *file)
                return -ENOMEM;
 
        list->hiddev = hiddev_table[i];
+
+       spin_lock_irqsave(&list->hiddev->list_lock, flags);
        list_add_tail(&list->node, &hiddev_table[i]->list);
+       spin_unlock_irqrestore(&list->hiddev->list_lock, flags);
+
        file->private_data = list;
 
        if (!list->hiddev->open++)
@@ -725,6 +739,14 @@ inval:
        return -EINVAL;
 }
 
+#ifdef CONFIG_COMPAT
+static long hiddev_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+       struct inode *inode = file->f_path.dentry->d_inode;
+       return hiddev_ioctl(inode, file, cmd, (unsigned long)compat_ptr(arg));
+}
+#endif
+
 static const struct file_operations hiddev_fops = {
        .owner =        THIS_MODULE,
        .read =         hiddev_read,
@@ -734,6 +756,9 @@ static const struct file_operations hiddev_fops = {
        .release =      hiddev_release,
        .ioctl =        hiddev_ioctl,
        .fasync =       hiddev_fasync,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = hiddev_compat_ioctl,
+#endif
 };
 
 static struct usb_class_driver hiddev_class = {
@@ -766,13 +791,14 @@ int hiddev_connect(struct hid_device *hid)
 
        retval = usb_register_dev(usbhid->intf, &hiddev_class);
        if (retval) {
-               err("Not able to get a minor for this device.");
+               err_hid("Not able to get a minor for this device.");
                kfree(hiddev);
                return -1;
        }
 
        init_waitqueue_head(&hiddev->wait);
        INIT_LIST_HEAD(&hiddev->list);
+       spin_lock_init(&hiddev->list_lock);
        hiddev->hid = hid;
        hiddev->exist = 1;