Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Feb 2006 05:18:17 +0000 (21:18 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Feb 2006 05:18:17 +0000 (21:18 -0800)
1  2 
drivers/usb/input/hiddev.c

index 77be6b9a820ff4fddffe0727e8d3f7add23ac63e,3f7274906c1327b2364d8c74e056f1cbe157d502..925f5aba06f583555c4f521c7bc2e809caf9f921
@@@ -35,6 -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
@@@ -631,7 -632,7 +631,7 @@@ static int hiddev_ioctl(struct inode *i
  
                        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;
                        }
  
@@@ -831,10 -832,12 +831,10 @@@ static /* const */ struct usb_driver hi
  
  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");
  }