From 212e6dbc6a6880642b534d2646fab98ea4e87a3a Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 19:16:45 +0200
Subject: [PATCH] --- yaml --- r: 100381 b: refs/heads/master c:
 0410e689b19b6ca010a6a44abfa820968ae15733 h: refs/heads/master i:   100379:
 cb66cd34e9f9b0a7ed44e7da3239adb2ff40a955 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/misc/sony-laptop.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 72218cf9324e..d946f764793f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9edca64b724db74373f0c9ef7cb044a5f221a4a3
+refs/heads/master: 0410e689b19b6ca010a6a44abfa820968ae15733
diff --git a/trunk/drivers/misc/sony-laptop.c b/trunk/drivers/misc/sony-laptop.c
index 00e48e2a9c11..60775be22822 100644
--- a/trunk/drivers/misc/sony-laptop.c
+++ b/trunk/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;
 }