Merge commit 'v2.6.34-rc6' into x86/cpu

[firefly-linux-kernel-4.4.55.git] / drivers / usb / usb-skeleton.c

diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c
index e94176bfd2726f8a69e2a34120494762c93a9c19..61522787f39cdd4f2fbfd99d7467be4c62757031 100644 (file)
--- a/drivers/usb/usb-skeleton.c
+++ b/drivers/usb/usb-skeleton.c
@@ -18,7 +18,6 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kref.h>
-#include <linux/smp_lock.h>
 #include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>
@@ -91,7 +90,6 @@ static int skel_open(struct inode *inode, struct file *file)
        int subminor;
        int retval = 0;
 
-       lock_kernel();
        subminor = iminor(inode);
 
        interface = usb_find_interface(&skel_driver, subminor);
@@ -137,7 +135,6 @@ static int skel_open(struct inode *inode, struct file *file)
        mutex_unlock(&dev->io_mutex);
 
 exit:
-       unlock_kernel();
        return retval;
 }