]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
Input: uinput - remove BKL from uinput_open function
authorThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Sat, 30 Jan 2010 07:53:57 +0000 (23:53 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 30 Jan 2010 07:55:18 +0000 (23:55 -0800)
Commit 8702965848ed4bee27486a3e3d2ae34ebba6dd83 pushed down the BKL
into uinput open function. However, there's nothing that needs locking
in there.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/misc/uinput.c

index d3f57245420a008a412afa9b55dd4bd8f015ce8d..18206e18d1b1f622b8a3daf3cc0d61dd7af311f3 100644 (file)
@@ -34,7 +34,6 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/uinput.h>
@@ -284,7 +283,6 @@ static int uinput_open(struct inode *inode, struct file *file)
        if (!newdev)
                return -ENOMEM;
 
-       lock_kernel();
        mutex_init(&newdev->mutex);
        spin_lock_init(&newdev->requests_lock);
        init_waitqueue_head(&newdev->requests_waitq);
@@ -292,7 +290,6 @@ static int uinput_open(struct inode *inode, struct file *file)
        newdev->state = UIST_NEW_DEVICE;
 
        file->private_data = newdev;
-       unlock_kernel();
 
        return 0;
 }