evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Input: cdev lock_kernel() pushdown

Browse source 
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet 2008-05-15 10:37:16 -06:00
parent 702e57d9ef
commit 2edbf8537e
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/input/input.c
View file

@ -21,6 +21,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/smp_lock.h>
MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>"); MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
MODULE_DESCRIPTION("Input core"); MODULE_DESCRIPTION("Input core");
@ -1588,13 +1589,17 @@ EXPORT_SYMBOL(input_unregister_handle);
static int input_open_file(struct inode *inode, struct file *file) static int input_open_file(struct inode *inode, struct file *file)
{ {
struct input_handler *handler = input_table[iminor(inode) >> 5]; struct input_handler *handler;
const struct file_operations *old_fops, *new_fops = NULL; const struct file_operations *old_fops, *new_fops = NULL;
int err; int err;
lock_kernel();
/* No load-on-demand here? */ /* No load-on-demand here? */
if (!handler || !(new_fops = fops_get(handler->fops))) handler = input_table[iminor(inode) >> 5];
return -ENODEV; if (!handler || !(new_fops = fops_get(handler->fops))) {
err = -ENODEV;
goto out;
}
/* /*
* That's _really_ odd. Usually NULL ->open means "nothing special", * That's _really_ odd. Usually NULL ->open means "nothing special",
@ -1602,7 +1607,8 @@ static int input_open_file(struct inode *inode, struct file *file)
*/ */
if (!new_fops->open) { if (!new_fops->open) {
fops_put(new_fops); fops_put(new_fops);
return -ENODEV; err = -ENODEV;
goto out;
} }
old_fops = file->f_op; old_fops = file->f_op;
file->f_op = new_fops; file->f_op = new_fops;
@ -1614,6 +1620,8 @@ static int input_open_file(struct inode *inode, struct file *file)
file->f_op = fops_get(old_fops); file->f_op = fops_get(old_fops);
} }
fops_put(old_fops); fops_put(old_fops);
out:
unlock_kernel();
return err; return err;
} }