[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>

diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/char/watchdog/mv64x60_wdt.c
index e07007543d09ef626a65af4c684a736cadeb85d5..07582bb8aea44a2b9f43879ea586f4ab96f006c0 100644 (file)
--- 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);
 }