---

yaml --- r: 63520 b: refs/heads/master c: 2422df5 h: refs/heads/master v: v3
git-mirror · Jul 24, 2007 · 167103e · 167103e
1 parent 9317665
commit 167103e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     	mv64x60_wdt_set_timeout(timeout);
+    	mv64x60_wdt_handler_disable();	/* in case timer was already running */
     	return misc_register(&mv64x60_wdt_miscdev);
     }
@@ Expand Down @@