From 167103e66858133e09640b670f2a1649f2ae4b24 Mon Sep 17 00:00:00 2001
From: Dale Farnsworth <dale@farnsworth.org>
Date: Tue, 24 Jul 2007 11:19:47 -0700
Subject: [PATCH] --- yaml --- r: 63520 b: refs/heads/master c:
 2422df5e26fbf40449d393e01d257badf211a61a h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/char/watchdog/mv64x60_wdt.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cbd8baed13c2..5e287cbe6ade 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf2fc92cae3630301d98b9faa38c1a98bb57d801
+refs/heads/master: 2422df5e26fbf40449d393e01d257badf211a61a
diff --git a/trunk/drivers/char/watchdog/mv64x60_wdt.c b/trunk/drivers/char/watchdog/mv64x60_wdt.c
index e07007543d09..07582bb8aea4 100644
--- a/trunk/drivers/char/watchdog/mv64x60_wdt.c
+++ b/trunk/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);
 }