1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index d3c824dc2358..ea7f803f6248 100644
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -10,12 +10,12 @@
 #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>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/slab.h>
 
 
 /* RIO uses the NatSemi Super I/O power management logical device
@@ -75,7 +75,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;
 }
@@ -87,7 +86,7 @@ static int riowd_release(struct inode *inode, struct file *filp)
 
 static long riowd_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
-        static struct watchdog_info info = {
+        static const struct watchdog_info info = {
                 .options                = WDIOF_SETTIMEOUT,
                 .firmware_version       = 1,
                 .identity               = DRIVER_NAME,
@@ -194,6 +193,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 +206,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: