aboutsummaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char')
-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);
}