Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / usb / input / hiddev.c

diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
index 96b7c90..c4670e1 100644 (file)
--- a/drivers/usb/input/hiddev.c
+++ b/drivers/usb/input/hiddev.c
@@ -35,7 +35,6 @@
 #include <linux/usb.h>
 #include "hid.h"
 #include <linux/hiddev.h>
-#include <linux/devfs_fs_kernel.h>
 
 #ifdef CONFIG_USB_DYNAMIC_MINORS
 #define HIDDEV_MINOR_BASE      0
@@ -95,7 +94,7 @@ hiddev_lookup_report(struct hid_device *hid, struct hiddev_report_info *rinfo)
                        return NULL;
                rinfo->report_id = ((struct hid_report *) list)->id;
                break;
-               
+
        case HID_REPORT_ID_NEXT:
                list = (struct list_head *)
                        report_enum->report_id_hash[rinfo->report_id & HID_REPORT_ID_MASK];
@@ -106,7 +105,7 @@ hiddev_lookup_report(struct hid_device *hid, struct hiddev_report_info *rinfo)
                        return NULL;
                rinfo->report_id = ((struct hid_report *) list)->id;
                break;
-               
+
        default:
                return NULL;
        }
@@ -158,7 +157,7 @@ static void hiddev_send_event(struct hid_device *hid,
                if (uref->field_index != HID_FIELD_INDEX_NONE ||
                    (list->flags & HIDDEV_FLAG_REPORT) != 0) {
                        list->buffer[list->head] = *uref;
-                       list->head = (list->head + 1) & 
+                       list->head = (list->head + 1) &
                                (HIDDEV_BUFFER_SIZE - 1);
                        kill_fasync(&list->fasync, SIGIO, POLL_IN);
                }
@@ -179,9 +178,9 @@ void hiddev_hid_event(struct hid_device *hid, struct hid_field *field,
        unsigned type = field->report_type;
        struct hiddev_usage_ref uref;
 
-       uref.report_type = 
+       uref.report_type =
          (type == HID_INPUT_REPORT) ? HID_REPORT_TYPE_INPUT :
-         ((type == HID_OUTPUT_REPORT) ? HID_REPORT_TYPE_OUTPUT : 
+         ((type == HID_OUTPUT_REPORT) ? HID_REPORT_TYPE_OUTPUT :
           ((type == HID_FEATURE_REPORT) ? HID_REPORT_TYPE_FEATURE:0));
        uref.report_id = field->report->id;
        uref.field_index = field->index;
@@ -199,9 +198,9 @@ void hiddev_report_event(struct hid_device *hid, struct hid_report *report)
        struct hiddev_usage_ref uref;
 
        memset(&uref, 0, sizeof(uref));
-       uref.report_type = 
+       uref.report_type =
          (type == HID_INPUT_REPORT) ? HID_REPORT_TYPE_INPUT :
-         ((type == HID_OUTPUT_REPORT) ? HID_REPORT_TYPE_OUTPUT : 
+         ((type == HID_OUTPUT_REPORT) ? HID_REPORT_TYPE_OUTPUT :
           ((type == HID_FEATURE_REPORT) ? HID_REPORT_TYPE_FEATURE:0));
        uref.report_id = report->id;
        uref.field_index = HID_FIELD_INDEX_NONE;
@@ -236,7 +235,7 @@ static int hiddev_release(struct inode * inode, struct file * file)
        *listptr = (*listptr)->next;
 
        if (!--list->hiddev->open) {
-               if (list->hiddev->exist) 
+               if (list->hiddev->exist)
                        hid_close(list->hiddev->hid);
                else
                        kfree(list->hiddev);
@@ -258,9 +257,8 @@ static int hiddev_open(struct inode * inode, struct file * file) {
        if (i >= HIDDEV_MINORS || !hiddev_table[i])
                return -ENODEV;
 
-       if (!(list = kmalloc(sizeof(struct hiddev_list), GFP_KERNEL)))
+       if (!(list = kzalloc(sizeof(struct hiddev_list), GFP_KERNEL)))
                return -ENOMEM;
-       memset(list, 0, sizeof(struct hiddev_list));
 
        list->hiddev = hiddev_table[i];
        list->next = hiddev_table[i]->list;
@@ -303,7 +301,7 @@ static ssize_t hiddev_read(struct file * file, char __user * buffer, size_t coun
                if (list->head == list->tail) {
                        add_wait_queue(&list->hiddev->wait, &wait);
                        set_current_state(TASK_INTERRUPTIBLE);
-                       
+
                        while (list->head == list->tail) {
                                if (file->f_flags & O_NONBLOCK) {
                                        retval = -EAGAIN;
@@ -317,8 +315,9 @@ static ssize_t hiddev_read(struct file * file, char __user * buffer, size_t coun
                                        retval = -EIO;
                                        break;
                                }
-                               
+
                                schedule();
+                               set_current_state(TASK_INTERRUPTIBLE);
                        }
 
                        set_current_state(TASK_RUNNING);
@@ -329,7 +328,7 @@ static ssize_t hiddev_read(struct file * file, char __user * buffer, size_t coun
                        return retval;
 
 
-               while (list->head != list->tail && 
+               while (list->head != list->tail &&
                       retval + event_size <= count) {
                        if ((list->flags & HIDDEV_FLAG_UREF) == 0) {
                                if (list->buffer[list->tail].field_index !=
@@ -405,10 +404,10 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                        return -EINVAL;
 
                for (i = 0; i < hid->maxcollection; i++)
-                       if (hid->collection[i].type == 
+                       if (hid->collection[i].type ==
                            HID_COLLECTION_APPLICATION && arg-- == 0)
                                break;
-               
+
                if (i == hid->maxcollection)
                        return -EINVAL;
 
@@ -507,6 +506,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                        return -EINVAL;
 
                hid_submit_report(hid, report, USB_DIR_OUT);
+               hid_wait_io(hid);
 
                return 0;
 
@@ -562,7 +562,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                if (!uref_multi)
                        return -ENOMEM;
                uref = &uref_multi->uref;
-               if (copy_from_user(uref, user_arg, sizeof(*uref))) 
+               if (copy_from_user(uref, user_arg, sizeof(*uref)))
                        goto fault;
 
                rinfo.report_type = uref->report_type;
@@ -595,7 +595,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                        return -ENOMEM;
                uref = &uref_multi->uref;
                if (cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) {
-                       if (copy_from_user(uref_multi, user_arg, 
+                       if (copy_from_user(uref_multi, user_arg,
                                           sizeof(*uref_multi)))
                                goto fault;
                } else {
@@ -603,7 +603,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                                goto fault;
                }
 
-               if (cmd != HIDIOCGUSAGE && 
+               if (cmd != HIDIOCGUSAGE &&
                    cmd != HIDIOCGUSAGES &&
                    uref->report_type == HID_REPORT_TYPE_INPUT)
                        goto inval;
@@ -631,7 +631,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
 
                        else if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) &&
                                 (uref_multi->num_values > HID_MAX_MULTI_USAGES ||
-                                 uref->usage_index + uref_multi->num_values >= field->report_count))
+                                 uref->usage_index + uref_multi->num_values > field->report_count))
                                goto inval;
                        }
 
@@ -651,16 +651,16 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                                return field->usage[uref->usage_index].collection_index;
                        case HIDIOCGUSAGES:
                                for (i = 0; i < uref_multi->num_values; i++)
-                                       uref_multi->values[i] = 
+                                       uref_multi->values[i] =
                                            field->value[uref->usage_index + i];
-                               if (copy_to_user(user_arg, uref_multi, 
+                               if (copy_to_user(user_arg, uref_multi,
                                                 sizeof(*uref_multi)))
                                        goto fault;
                                goto goodreturn;
                        case HIDIOCSUSAGES:
                                for (i = 0; i < uref_multi->num_values; i++)
-                                       field->value[uref->usage_index + i] = 
-                                           uref_multi->values[i];
+                                       field->value[uref->usage_index + i] =
+                                           uref_multi->values[i];
                                goto goodreturn;
                }
 
@@ -670,7 +670,7 @@ goodreturn:
 fault:
                kfree(uref_multi);
                return -EFAULT;
-inval:         
+inval:
                kfree(uref_multi);
                return -EINVAL;
 
@@ -731,10 +731,9 @@ static struct file_operations hiddev_fops = {
 };
 
 static struct usb_class_driver hiddev_class = {
-       .name =         "usb/hid/hiddev%d",
+       .name =         "hiddev%d",
        .fops =         &hiddev_fops,
-       .mode =         S_IFCHR | S_IRUGO | S_IWUSR,
-               .minor_base =   HIDDEV_MINOR_BASE,
+       .minor_base =   HIDDEV_MINOR_BASE,
 };
 
 /*
@@ -747,7 +746,7 @@ int hiddev_connect(struct hid_device *hid)
        int retval;
 
        for (i = 0; i < hid->maxcollection; i++)
-               if (hid->collection[i].type == 
+               if (hid->collection[i].type ==
                    HID_COLLECTION_APPLICATION &&
                    !IS_INPUT_APPLICATION(hid->collection[i].usage))
                        break;
@@ -755,11 +754,10 @@ int hiddev_connect(struct hid_device *hid)
        if (i == hid->maxcollection && (hid->quirks & HID_QUIRK_HIDDEV) == 0)
                return -1;
 
-       if (!(hiddev = kmalloc(sizeof(struct hiddev), GFP_KERNEL)))
+       if (!(hiddev = kzalloc(sizeof(struct hiddev), GFP_KERNEL)))
                return -1;
-       memset(hiddev, 0, sizeof(struct hiddev));
 
-       retval = usb_register_dev(hid->intf, &hiddev_class);
+       retval = usb_register_dev(hid->intf, &hiddev_class);
        if (retval) {
                err("Not able to get a minor for this device.");
                kfree(hiddev);
@@ -768,12 +766,12 @@ int hiddev_connect(struct hid_device *hid)
 
        init_waitqueue_head(&hiddev->wait);
 
-       hiddev_table[hid->intf->minor - HIDDEV_MINOR_BASE] = hiddev;
+       hiddev_table[hid->intf->minor - HIDDEV_MINOR_BASE] = hiddev;
 
        hiddev->hid = hid;
        hiddev->exist = 1;
 
-       hid->minor = hid->intf->minor;
+       hid->minor = hid->intf->minor;
        hid->hiddev = hiddev;
 
        return 0;
@@ -818,7 +816,7 @@ void hiddev_disconnect(struct hid_device *hid)
 /* We never attach in this manner, and rely on HID to connect us.  This
  * is why there is no disconnect routine defined in the usb_driver either.
  */
-static int hiddev_usbd_probe(struct usb_interface *intf, 
+static int hiddev_usbd_probe(struct usb_interface *intf,
                             const struct usb_device_id *hiddev_info)
 {
        return -ENODEV;
@@ -826,19 +824,16 @@ static int hiddev_usbd_probe(struct usb_interface *intf,
 
 
 static /* const */ struct usb_driver hiddev_driver = {
-       .owner =        THIS_MODULE,
        .name =         "hiddev",
        .probe =        hiddev_usbd_probe,
 };
 
 int __init hiddev_init(void)
 {
-       devfs_mk_dir("usb/hid");
        return usb_register(&hiddev_driver);
 }
 
 void hiddev_exit(void)
 {
        usb_deregister(&hiddev_driver);
-       devfs_remove("usb/hid");
 }