From: Wim Van Sebroeck <wim@iguana.be>
Date: Mon, 23 Feb 2009 13:08:37 +0000 (+0000)
Subject: [WATCHDOG] rc32434_wdt: make sure watchdog is not running at startup
X-Git-Tag: v2.6.30-rc1~663^2~10
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f296b14355a2d0cb170a85236ec391bb0a3fdb3a;p=~emulex%2Finfiniband.git

[WATCHDOG] rc32434_wdt: make sure watchdog is not running at startup

Make sure that the watchdog is not running after loading
and before it is started by opening /dev/watchdog.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
---

diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index bffd4a2b115..071ff7bb81d 100644
--- 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;
@@ -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)) {