Skip to content

L
linux-davinci
Commit 87029658 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jonathan Corbet
Browse files
Options

uinput: BKL pushdown 

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent f138e481
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
drivers/input/misc/uinput.c
View file @ 87029658
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/uinput.h> #include <linux/uinput.h>
#include <linux/smp_lock.h>
static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
{ {
...@@ -222,6 +223,7 @@ static int uinput_open(struct inode *inode, struct file *file) ...@@ -222,6 +223,7 @@ static int uinput_open(struct inode *inode, struct file *file)
if (!newdev) if (!newdev)
return -ENOMEM; return -ENOMEM;
lock_kernel();
mutex_init(&newdev->mutex); mutex_init(&newdev->mutex);
spin_lock_init(&newdev->requests_lock); spin_lock_init(&newdev->requests_lock);
init_waitqueue_head(&newdev->requests_waitq); init_waitqueue_head(&newdev->requests_waitq);
...@@ -229,6 +231,7 @@ static int uinput_open(struct inode *inode, struct file *file) ...@@ -229,6 +231,7 @@ static int uinput_open(struct inode *inode, struct file *file)
newdev->state = UIST_NEW_DEVICE; newdev->state = UIST_NEW_DEVICE;
file->private_data = newdev; file->private_data = newdev;
unlock_kernel();
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment