1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index fc0dd63e672..0f710317a94 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -46,7 +46,6 @@
 #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>
@@ -2180,10 +2179,15 @@ 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();
+        unsigned long flags;
+
+        spin_lock_irqsave(sonypi_compat.fifo->lock, flags);
+
         if (atomic_inc_return(&sonypi_compat.open_count) == 1)
-                kfifo_reset(sonypi_compat.fifo);
-        unlock_kernel();
+                __kfifo_reset(sonypi_compat.fifo);
+
+        spin_unlock_irqrestore(sonypi_compat.fifo->lock, flags);
+
         return 0;
 }