Merge ../linux-2.6

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
index 4dff8473553d..925f5aba06f5 100644
--- 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
@@ -632,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;
                         }
 
@@ -832,12 +831,10 @@ static /* const */ struct usb_driver hiddev_driver = {
 
 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");
 }