diff options
Diffstat (limited to 'drivers/usb/input/hiddev.c')
-rw-r--r-- | drivers/usb/input/hiddev.c | 5 |
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 @@ | |||
35 | #include <linux/usb.h> | 35 | #include <linux/usb.h> |
36 | #include "hid.h" | 36 | #include "hid.h" |
37 | #include <linux/hiddev.h> | 37 | #include <linux/hiddev.h> |
38 | #include <linux/devfs_fs_kernel.h> | ||
39 | 38 | ||
40 | #ifdef CONFIG_USB_DYNAMIC_MINORS | 39 | #ifdef CONFIG_USB_DYNAMIC_MINORS |
41 | #define HIDDEV_MINOR_BASE 0 | 40 | #define HIDDEV_MINOR_BASE 0 |
@@ -632,7 +631,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd | |||
632 | 631 | ||
633 | else if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) && | 632 | else if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) && |
634 | (uref_multi->num_values > HID_MAX_MULTI_USAGES || | 633 | (uref_multi->num_values > HID_MAX_MULTI_USAGES || |
635 | uref->usage_index + uref_multi->num_values >= field->report_count)) | 634 | uref->usage_index + uref_multi->num_values > field->report_count)) |
636 | goto inval; | 635 | goto inval; |
637 | } | 636 | } |
638 | 637 | ||
@@ -832,12 +831,10 @@ static /* const */ struct usb_driver hiddev_driver = { | |||
832 | 831 | ||
833 | int __init hiddev_init(void) | 832 | int __init hiddev_init(void) |
834 | { | 833 | { |
835 | devfs_mk_dir("usb/hid"); | ||
836 | return usb_register(&hiddev_driver); | 834 | return usb_register(&hiddev_driver); |
837 | } | 835 | } |
838 | 836 | ||
839 | void hiddev_exit(void) | 837 | void hiddev_exit(void) |
840 | { | 838 | { |
841 | usb_deregister(&hiddev_driver); | 839 | usb_deregister(&hiddev_driver); |
842 | devfs_remove("usb/hid"); | ||
843 | } | 840 | } |