commit b05c9e6cd939b6f79be17e9b6a23ca15a219dec2
author Arnd Bergmann <arnd@arndb.de> Tue May 20 19:15:43 2008 +0200
committer Jonathan Corbet <corbet@lwn.net> Fri Jun 20 14:05:55 2008 -0600
tree 679f3dc744057f7a2ce5c6de32303486ea97755b
parent 122bc5eaf81a3870f6cc00d2e5e97f32f92e636b

cpwatchdog: BKL pushdown

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

drivers/sbus/char/cpwatchdog.c

diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index 2357034..23abfdf 100644
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/sbus/char/cpwatchdog.c
@@ -279,6 +279,7 @@
 
 static int wd_open(struct inode *inode, struct file *f)
 {
+	lock_kernel();
 	switch(iminor(inode))
 	{
 		case WD0_MINOR:
@@ -291,6 +292,7 @@
 			f->private_data = &wd_dev.watchdog[WD2_ID];
 			break;
 		default:
+			unlock_kernel();
 			return(-ENODEV);
 	}
 
@@ -304,11 +306,13 @@
 						(void *)wd_dev.regs)) {
 			printk("%s: Cannot register IRQ %d\n", 
 				WD_OBPNAME, wd_dev.irq);
+			unlock_kernel();
 			return(-EBUSY);
 		}
 		wd_dev.initialized = 1;
 	}
 
+	unlock_kernel();
 	return(nonseekable_open(inode, f));
 }