git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into cpus4096
[pandora-kernel.git]
/
drivers
/
input
/
misc
/
uinput.c
diff --git
a/drivers/input/misc/uinput.c
b/drivers/input/misc/uinput.c
index
a56ad4b
..
2bcfa0b
100644
(file)
--- a/
drivers/input/misc/uinput.c
+++ b/
drivers/input/misc/uinput.c
@@
-37,6
+37,7
@@
#include <linux/fs.h>
#include <linux/miscdevice.h>
#include <linux/uinput.h>
#include <linux/fs.h>
#include <linux/miscdevice.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)
if (!newdev)
return -ENOMEM;
if (!newdev)
return -ENOMEM;
+ lock_kernel();
mutex_init(&newdev->mutex);
spin_lock_init(&newdev->requests_lock);
init_waitqueue_head(&newdev->requests_waitq);
mutex_init(&newdev->mutex);
spin_lock_init(&newdev->requests_lock);
init_waitqueue_head(&newdev->requests_waitq);
@@
-229,6
+231,7
@@
static int uinput_open(struct inode *inode, struct file *file)
newdev->state = UIST_NEW_DEVICE;
file->private_data = newdev;
newdev->state = UIST_NEW_DEVICE;
file->private_data = newdev;
+ unlock_kernel();
return 0;
}
return 0;
}