From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 17:16:10 +0000 (+0200)
Subject: lcd: BKL pushdown
X-Git-Tag: v2.6.27-rc1~1103^2~52
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=600bf8140c22e473ef0806ae45214aaaf53e0da3;p=linux-2.6-omap-h63xx.git

lcd: BKL pushdown

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

diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c
index 4fe9206f84d..1c29b20e4f4 100644
--- a/drivers/char/lcd.c
+++ b/drivers/char/lcd.c
@@ -20,6 +20,7 @@
 #include <linux/mc146818rtc.h>
 #include <linux/netdevice.h>
 #include <linux/sched.h>
+#include <linux/smp_lock.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
@@ -414,6 +415,8 @@ static int lcd_ioctl(struct inode *inode, struct file *file,
 
 static int lcd_open(struct inode *inode, struct file *file)
 {
+	cycle_kernel_lock();
+
 	if (!lcd_present)
 		return -ENXIO;
 	else