From 850097dfeb362c28aba18dbb9435bccb8ffd3ca5 Mon Sep 17 00:00:00 2001
From: Wim Van Sebroeck <wim@iguana.be>
Date: Mon, 23 Feb 2009 13:08:37 +0000
Subject: [PATCH] --- yaml --- r: 133773 b: refs/heads/master c:
 f296b14355a2d0cb170a85236ec391bb0a3fdb3a h: refs/heads/master i:   133771:
 47cfc0024ef0bd1ce33f721f90bec78d4e699afb v: v3

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

diff --git a/[refs] b/[refs]
index 324ceddef14a..942180ac3d14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e455b6b4ed66be0c2aa6e41fd9027c1ce585a490
+refs/heads/master: f296b14355a2d0cb170a85236ec391bb0a3fdb3a
diff --git a/trunk/drivers/watchdog/rc32434_wdt.c b/trunk/drivers/watchdog/rc32434_wdt.c
index bffd4a2b1151..071ff7bb81d1 100644
--- a/trunk/drivers/watchdog/rc32434_wdt.c
+++ b/trunk/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;
@@ -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)) {