From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 17:16:45 +0000 (+0200)
Subject: sony-laptop: BKL pushdown
X-Git-Tag: v2.6.27-rc1~1103^2~28
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0410e689b19b6ca010a6a44abfa820968ae15733;p=linux-2.6-omap-h63xx.git

sony-laptop: BKL pushdown

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 00e48e2a9c1..60775be2282 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -46,6 +46,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/backlight.h>
 #include <linux/platform_device.h>
@@ -1927,8 +1928,10 @@ static int sonypi_misc_release(struct inode *inode, struct file *file)
 static int sonypi_misc_open(struct inode *inode, struct file *file)
 {
 	/* Flush input queue on first open */
+	lock_kernel();
 	if (atomic_inc_return(&sonypi_compat.open_count) == 1)
 		kfifo_reset(sonypi_compat.fifo);
+	unlock_kernel();
 	return 0;
 }