---

yaml --- r: 198373 b: refs/heads/master c: bb6f360 h: refs/heads/master i: 198371: 330608e v: v3
git-mirror · May 25, 2010 · c1dade9 · c1dade9
1 parent 0959634
commit c1dade9
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: 4724ba575ea73431aba8a48be6f5a382c470418d
+refs/heads/master: bb6f36070cf53ebf08383a026e1d3a437cb310d1
diff --git a/trunk/drivers/watchdog/twl4030_wdt.c b/trunk/drivers/watchdog/twl4030_wdt.c
@@ -190,6 +190,8 @@ static int __devinit twl4030_wdt_probe(struct platform_device *pdev)
 
 	twl4030_wdt_dev = pdev;
 
+	twl4030_wdt_disable(wdt);
+
 	ret = misc_register(&wdt->miscdev);
 	if (ret) {
 		dev_err(wdt->miscdev.parent,