From 2422df5e26fbf40449d393e01d257badf211a61a Mon Sep 17 00:00:00 2001 From: Dale Farnsworth Date: Tue, 24 Jul 2007 11:19:47 -0700 Subject: [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 Signed-off-by: Wim Van Sebroeck --- drivers/char/watchdog/mv64x60_wdt.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/char/watchdog') diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/char/watchdog/mv64x60_wdt.c index e07007543d09..07582bb8aea4 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); } -- cgit v1.2.3