diff options
author | Wim Van Sebroeck <wim@iguana.be> | 2009-02-23 08:08:37 -0500 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2009-03-25 05:02:17 -0400 |
commit | f296b14355a2d0cb170a85236ec391bb0a3fdb3a (patch) | |
tree | fc3c7c4888fe41ca5be74598e1294a86d1e610d9 /drivers/watchdog | |
parent | e455b6b4ed66be0c2aa6e41fd9027c1ce585a490 (diff) |
[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>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r-- | drivers/watchdog/rc32434_wdt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c index bffd4a2b1151..071ff7bb81d1 100644 --- a/drivers/watchdog/rc32434_wdt.c +++ b/drivers/watchdog/rc32434_wdt.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | #define PFX KBUILD_MODNAME ": " | 36 | #define PFX KBUILD_MODNAME ": " |
37 | 37 | ||
38 | #define VERSION "0.5" | 38 | #define VERSION "1.0" |
39 | 39 | ||
40 | static struct { | 40 | static struct { |
41 | unsigned long inuse; | 41 | unsigned long inuse; |
@@ -284,6 +284,9 @@ static int __devinit rc32434_wdt_probe(struct platform_device *pdev) | |||
284 | 284 | ||
285 | spin_lock_init(&rc32434_wdt_device.io_lock); | 285 | spin_lock_init(&rc32434_wdt_device.io_lock); |
286 | 286 | ||
287 | /* Make sure the watchdog is not running */ | ||
288 | rc32434_wdt_stop(); | ||
289 | |||
287 | /* Check that the heartbeat value is within it's range; | 290 | /* Check that the heartbeat value is within it's range; |
288 | * if not reset to the default */ | 291 | * if not reset to the default */ |
289 | if (rc32434_wdt_set(timeout)) { | 292 | if (rc32434_wdt_set(timeout)) { |