diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2009-02-23 14:08:37 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2009-03-25 10:02:17 +0100 |
| commit | f296b14355a2d0cb170a85236ec391bb0a3fdb3a (patch) | |
| tree | fc3c7c4888fe41ca5be74598e1294a86d1e610d9 /drivers/watchdog | |
| parent | [WATCHDOG] rc32434_wdt: add spin_locking (diff) | |
| download | linux-f296b14355a2d0cb170a85236ec391bb0a3fdb3a.tar.xz linux-f296b14355a2d0cb170a85236ec391bb0a3fdb3a.zip | |
[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 @@ #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)) { |