summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2008-05-20 19:16:43 +0200
committerJonathan Corbet <corbet@lwn.net>2008-07-02 15:06:25 -0600
commit9edca64b724db74373f0c9ef7cb044a5f221a4a3 (patch)
tree6330529f51351ca95002189fdf63283930e9f91a /drivers/input
parent556e4b0b69d6e45e6b4e61390ef5aebce3ea432d (diff)
downloadblackbird-op-linux-9edca64b724db74373f0c9ef7cb044a5f221a4a3.tar.gz
blackbird-op-linux-9edca64b724db74373f0c9ef7cb044a5f221a4a3.zip
serio: BKL pushdown
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/serio/serio_raw.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index 0403622ae267..c9397c8ee97e 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -10,6 +10,7 @@
*/
#include <linux/slab.h>
+#include <linux/smp_lock.h>
#include <linux/poll.h>
#include <linux/module.h>
#include <linux/serio.h>
@@ -81,9 +82,10 @@ static int serio_raw_open(struct inode *inode, struct file *file)
struct serio_raw_list *list;
int retval = 0;
+ lock_kernel();
retval = mutex_lock_interruptible(&serio_raw_mutex);
if (retval)
- return retval;
+ goto out_bkl;
if (!(serio_raw = serio_raw_locate(iminor(inode)))) {
retval = -ENODEV;
@@ -108,6 +110,8 @@ static int serio_raw_open(struct inode *inode, struct file *file)
out:
mutex_unlock(&serio_raw_mutex);
+out_bkl:
+ unlock_kernel();
return retval;
}
OpenPOWER on IntegriCloud