aboutsummaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/rc32434_wdt.c5
1 files changed, 4 insertions, 1 deletions
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)) {