From 05e37f1510935bf17d8c42ee46ccfb6d9aa48ad1 Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oliver@neukum.org>
Date: Thu, 12 Feb 2009 13:17:52 +0100
Subject: [PATCH] --- yaml --- r: 140398 b: refs/heads/master c:
 e43bd67d721bccbfe144c0b586b0ab3a2a157968 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/hid/usbhid/hiddev.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5e20290d6e08..4dfab0ae7a0c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f4303fb2ec68055e793b84887a7ae0f9ea7cc2d
+refs/heads/master: e43bd67d721bccbfe144c0b586b0ab3a2a157968
diff --git a/trunk/drivers/hid/usbhid/hiddev.c b/trunk/drivers/hid/usbhid/hiddev.c
index aa214170baf4..93dcb7e29102 100644
--- a/trunk/drivers/hid/usbhid/hiddev.c
+++ b/trunk/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;
 }