Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
---
drivers/char/watchdog/mv64x60_wdt.c | 2 ++
1 file changed, 2 insertions(+)
Index: linux-2.6-powerpc-wdt/drivers/char/watchdog/mv64x60_wdt.c
===================================================================
--- linux-2.6-powerpc-wdt.orig/drivers/char/watchdog/mv64x60_wdt.c 2007-07-20 19:33:30.000000000 +0000
+++ linux-2.6-powerpc-wdt/drivers/char/watchdog/mv64x60_wdt.c 2007-07-20 19:34:23.000000000 +0000
@@ -262,6 +262,8 @@ static int __devinit mv64x60_wdt_probe(s
mv64x60_wdt_set_timeout(timeout);
+ mv64x60_wdt_handler_disable(); /* in case timer was already running */
+
return misc_register(&mv64x60_wdt_miscdev);
}
-