1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 1ca6f4635eeb..0c6b4d4e7e27 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -30,6 +30,7 @@
 #include <linux/major.h>
 #include <linux/hid.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 
 #include <linux/hidraw.h>
 
@@ -157,6 +158,7 @@ static int hidraw_open(struct inode *inode, struct file *file)
         struct hidraw_list *list;
         int err = 0;
 
+        lock_kernel();
         if (!(list = kzalloc(sizeof(struct hidraw_list), GFP_KERNEL))) {
                 err = -ENOMEM;
                 goto out;
@@ -183,6 +185,7 @@ static int hidraw_open(struct inode *inode, struct file *file)
 out_unlock:
         spin_unlock(&minors_lock);
 out:
+        unlock_kernel();
         return err;
 
 }
@@ -319,8 +322,9 @@ int hidraw_connect(struct hid_device *hid)
                 goto out;
         }
 
-        dev->dev = device_create(hidraw_class, NULL, MKDEV(hidraw_major, minor),
-                                "%s%d", "hidraw", minor);
+        dev->dev = device_create_drvdata(hidraw_class, NULL,
+                                         MKDEV(hidraw_major, minor), NULL,
+                                         "%s%d", "hidraw", minor);
 
         if (IS_ERR(dev->dev)) {
                 spin_lock(&minors_lock);