OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Input: serio_raw - remove BKL 

serio_raw open function already uses a mutex. Also change formatting
a bit.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Thadeu Lima de Souza Cascardo 2010-03-09 20:38:47 -08:00 committed by Dmitry Torokhov
parent c90c6a885a
commit 77554b4d1f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/input/serio/serio_raw.c
View File

@ -81,12 +81,12 @@ static int serio_raw_open(struct inode *inode, struct file *file)
struct serio_raw_list *list; struct serio_raw_list *list;
int retval = 0; int retval = 0;
lock_kernel();
retval = mutex_lock_interruptible(&serio_raw_mutex); retval = mutex_lock_interruptible(&serio_raw_mutex);
if (retval) if (retval)
goto out_bkl; return retval;
if (!(serio_raw = serio_raw_locate(iminor(inode)))) { serio_raw = serio_raw_locate(iminor(inode));
if (!serio_raw) {
retval = -ENODEV; retval = -ENODEV;
goto out; goto out;
} }
@ -96,7 +96,8 @@ static int serio_raw_open(struct inode *inode, struct file *file)
goto out; goto out;
} }
if (!(list = kzalloc(sizeof(struct serio_raw_list), GFP_KERNEL))) { list = kzalloc(sizeof(struct serio_raw_list), GFP_KERNEL);
if (!list) {
retval = -ENOMEM; retval = -ENOMEM;
goto out; goto out;
} }
@ -109,8 +110,6 @@ static int serio_raw_open(struct inode *inode, struct file *file)
out: out:
mutex_unlock(&serio_raw_mutex); mutex_unlock(&serio_raw_mutex);
out_bkl:
unlock_kernel();
return retval; return retval;
} }