diff options
| author | Ben Dooks | 2006-04-20 00:02:56 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck | 2006-05-15 21:38:14 +0200 |
| commit | 655516c80ccb3ab2ba2d3063715889b00552a8b3 (patch) | |
| tree | 0fc0821a08dd30658e996d42b8bbc30607d0fe40 /drivers/char/watchdog/s3c2410_wdt.c | |
| parent | [WATCHDOG] i8xx_tco.c - remove support for ICH6 + ICH7 (diff) | |
| download | kernel-qcow2-linux-655516c80ccb3ab2ba2d3063715889b00552a8b3.tar.gz kernel-qcow2-linux-655516c80ccb3ab2ba2d3063715889b00552a8b3.tar.xz kernel-qcow2-linux-655516c80ccb3ab2ba2d3063715889b00552a8b3.zip | |
[WATCHDOG] s3c2410_wdt.c stop watchdog after boot
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>
Diffstat (limited to 'drivers/char/watchdog/s3c2410_wdt.c')
| -rw-r--r-- | drivers/char/watchdog/s3c2410_wdt.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c index 9dc54736e4eb..1ea04e9b2b0b 100644 --- a/drivers/char/watchdog/s3c2410_wdt.c +++ b/drivers/char/watchdog/s3c2410_wdt.c @@ -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; |