V4L/DVB (10424): gspca - vc032x: Add resolution 1280x1024 for sensor mi1310_soc.

[linux-2.6-omap-h63xx.git] / drivers / watchdog / rc32434_wdt.c

diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index bffd4a2b1151a8a75d854391bd1e11d8292787d0..f6cccc9df022cbb55b04aa5fac43fcfd6413964c 100644 (file)
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -35,7 +35,7 @@
 
 #define PFX KBUILD_MODNAME ": "
 
-#define VERSION "0.5"
+#define VERSION "1.0"
 
 static struct {
        unsigned long inuse;
@@ -247,7 +247,7 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
        return 0;
 }
 
-static struct file_operations rc32434_wdt_fops = {
+static const struct file_operations rc32434_wdt_fops = {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,
        .write          = rc32434_wdt_write,
@@ -284,6 +284,9 @@ static int __devinit rc32434_wdt_probe(struct platform_device *pdev)
 
        spin_lock_init(&rc32434_wdt_device.io_lock);
 
+       /* Make sure the watchdog is not running */
+       rc32434_wdt_stop();
+
        /* Check that the heartbeat value is within it's range;
         * if not reset to the default */
        if (rc32434_wdt_set(timeout)) {