Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6

[linux-2.6-omap-h63xx.git] / arch / um / drivers / harddog_kern.c

diff --git a/arch/um/drivers/harddog_kern.c b/arch/um/drivers/harddog_kern.c
index 55601687b3bcf735abadd11d555fdc7e59acc33d..d332503fa1beae1f54a53fbbb62356ea2113cfb1 100644 (file)
--- a/arch/um/drivers/harddog_kern.c
+++ b/arch/um/drivers/harddog_kern.c
@@ -66,10 +66,11 @@ static int harddog_open(struct inode *inode, struct file *file)
        int err = -EBUSY;
        char *sock = NULL;
 
+       lock_kernel();
        spin_lock(&lock);
        if(timer_alive)
                goto err;
-#ifdef CONFIG_HARDDOG_NOWAYOUT
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
        __module_get(THIS_MODULE);
 #endif
 
@@ -82,9 +83,11 @@ static int harddog_open(struct inode *inode, struct file *file)
 
        timer_alive = 1;
        spin_unlock(&lock);
+       unlock_kernel();
        return nonseekable_open(inode, file);
 err:
        spin_unlock(&lock);
+       unlock_kernel();
        return err;
 }