1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index aa214170baf4..93dcb7e29102 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -875,16 +875,21 @@ int hiddev_connect(struct hid_device *hid, unsigned int force)
         hiddev->hid = hid;
         hiddev->exist = 1;
 
+        /* when lock_kernel() usage is fixed in usb_open(),
+         * we could also fix it here */
+        lock_kernel();
         retval = usb_register_dev(usbhid->intf, &hiddev_class);
         if (retval) {
                 err_hid("Not able to get a minor for this device.");
                 hid->hiddev = NULL;
+                unlock_kernel();
                 kfree(hiddev);
                 return -1;
         } else {
                 hid->minor = usbhid->intf->minor;
                 hiddev_table[usbhid->intf->minor - HIDDEV_MINOR_BASE] = hiddev;
         }
+        unlock_kernel();
 
         return 0;
 }