aboutsummaryrefslogtreecommitdiff
path: root/drivers/char/watchdog
diff options
context:
space:
mode:
authorDale Farnsworth <dale@farnsworth.org>2007-07-24 11:19:47 -0700
committerWim Van Sebroeck <wim@iguana.be>2007-07-24 21:16:24 +0000
commit2422df5e26fbf40449d393e01d257badf211a61a (patch)
tree2a6019cbe0eda4d8e6933f3c0f8d754fb6434557 /drivers/char/watchdog
parentbf2fc92cae3630301d98b9faa38c1a98bb57d801 (diff)
[WATCHDOG] mv64x60_wdt: disable watchdog timer when driver is probed
Make sure that we disable the watchdog at start-up. Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/char/watchdog')
-rw-r--r--drivers/char/watchdog/mv64x60_wdt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/char/watchdog/mv64x60_wdt.c
index e07007543d0..07582bb8aea 100644
--- a/drivers/char/watchdog/mv64x60_wdt.c
+++ b/drivers/char/watchdog/mv64x60_wdt.c
@@ -261,6 +261,8 @@ static int __devinit mv64x60_wdt_probe(struct platform_device *dev)
mv64x60_wdt_set_timeout(timeout);
+ mv64x60_wdt_handler_disable(); /* in case timer was already running */
+
return misc_register(&mv64x60_wdt_miscdev);
}