2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 76c4bbe9dccb..3c1fcb7640ab 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -22,7 +22,6 @@
 #include <linux/list.h>
 #include <linux/mm.h>
 #include <linux/mutex.h>
-#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <asm/unaligned.h>
 #include <asm/byteorder.h>
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 39e27f4be4ac..215b2addddbb 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -852,8 +852,14 @@ static const struct file_operations hiddev_fops = {
 #endif
 };
 
+static char *hiddev_nodename(struct device *dev)
+{
+        return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
+}
+
 static struct usb_class_driver hiddev_class = {
         .name =         "hiddev%d",
+        .nodename =     hiddev_nodename,
         .fops =         &hiddev_fops,
         .minor_base =   HIDDEV_MINOR_BASE,
 };
@@ -957,7 +963,6 @@ static int hiddev_usbd_probe(struct usb_interface *intf,
         return -ENODEV;
 }
 
-
 static /* const */ struct usb_driver hiddev_driver = {
         .name =         "hiddev",
         .probe =        hiddev_usbd_probe,