---

yaml --- r: 210740 b: refs/heads/master c: 0e901be h: refs/heads/master v: v3
git-mirror · Sep 15, 2010 · 47e1fb9 · 47e1fb9
1 parent ddc7db1
commit 47e1fb9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae44855ae8b36e4194a0a43eec6351e81f880955
+refs/heads/master: 0e901bed4e053098f1c8411dcbf21324b7f61775
diff --git a/trunk/drivers/watchdog/ts72xx_wdt.c b/trunk/drivers/watchdog/ts72xx_wdt.c
@@ -449,6 +449,9 @@ static __devinit int ts72xx_wdt_probe(struct platform_device *pdev)
 	wdt->pdev = pdev;
 	mutex_init(&wdt->lock);
 
+	/* make sure that the watchdog is disabled */
+	ts72xx_wdt_stop(wdt);
+
 	error = misc_register(&ts72xx_wdt_miscdev);
 	if (error) {
 		dev_err(&pdev->dev, "failed to register miscdev\n");