From 67426ac661fca10a62e333d9c1dd776f9e477487 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 2 Nov 2009 21:16:28 -0800
Subject: [PATCH] --- yaml --- r: 170394 b: refs/heads/master c:
 462265bf494c4f2a2f6e06480590becadecbfea7 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/watchdog/riowd.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9cbf53e4f863..7481f0e7e5b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49ab972aea7fca7b94f9df0f1f077fdab40a825d
+refs/heads/master: 462265bf494c4f2a2f6e06480590becadecbfea7
diff --git a/trunk/drivers/watchdog/riowd.c b/trunk/drivers/watchdog/riowd.c
index d3c824dc2358..c14ae8676903 100644
--- a/trunk/drivers/watchdog/riowd.c
+++ b/trunk/drivers/watchdog/riowd.c
@@ -10,7 +10,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/miscdevice.h>
-#include <linux/smp_lock.h>
 #include <linux/watchdog.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
@@ -75,7 +74,6 @@ static void riowd_writereg(struct riowd *p, u8 val, int index)
 
 static int riowd_open(struct inode *inode, struct file *filp)
 {
-	cycle_kernel_lock();
 	nonseekable_open(inode, filp);
 	return 0;
 }
@@ -194,6 +192,8 @@ static int __devinit riowd_probe(struct of_device *op,
 		printk(KERN_ERR PFX "Cannot map registers.\n");
 		goto out_free;
 	}
+	/* Make miscdev useable right away */
+	riowd_device = p;
 
 	err = misc_register(&riowd_miscdev);
 	if (err) {
@@ -205,10 +205,10 @@ static int __devinit riowd_probe(struct of_device *op,
 	       "regs at %p\n", riowd_timeout, p->regs);
 
 	dev_set_drvdata(&op->dev, p);
-	riowd_device = p;
 	return 0;
 
 out_iounmap:
+	riowd_device = NULL;
 	of_iounmap(&op->resource[0], p->regs, 2);
 
 out_free: