From 47e1fb9d909b9c233aaf278d724ade3f11f1eaf3 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@iki.fi>
Date: Sun, 29 Aug 2010 13:53:14 +0300
Subject: [PATCH] --- yaml --- r: 210740 b: refs/heads/master c:
 0e901bed4e053098f1c8411dcbf21324b7f61775 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f43109e2ba35..72d26d1686c7 100644
--- 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
index 458c499c1223..18cdeb4c4258 100644
--- 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");