[WATCHDOG] s3c2410_wdt.c stop watchdog after boot
authorBen Dooks <ben-linux@fluff.org>
Wed, 19 Apr 2006 22:02:56 +0000 (23:02 +0100)
committerWim Van Sebroeck <wim@iguana.be>
Mon, 15 May 2006 19:38:14 +0000 (21:38 +0200)
If the s3c2410 watchdog timer is not enabled by
the driver at startup, ensure that it is stopped
in-case the boot process has enabled it.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@osdl.org>
drivers/char/watchdog/s3c2410_wdt.c

index 9dc5473..1ea04e9 100644 (file)
@@ -423,6 +423,12 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
        if (tmr_atboot && started == 0) {
                printk(KERN_INFO PFX "Starting Watchdog Timer\n");
                s3c2410wdt_start();
+       } else if (!tmr_atboot) {
+               /* if we're not enabling the watchdog, then ensure it is
+                * disabled if it has been left running from the bootloader
+                * or other source */
+
+               s3c2410wdt_stop();
        }
 
        return 0;