X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=drivers%2Fwatchdog%2Fts72xx_wdt.c;h=18cdeb4c4258a67ccdba77fc517596eaa71819b9;hb=0e901bed4e053098f1c8411dcbf21324b7f61775;hp=458c499c1223c6f73aaab93f9a6bdc7c816de5a2;hpb=ae44855ae8b36e4194a0a43eec6351e81f880955;p=mv-sheeva.git

diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
index 458c499c122..18cdeb4c425 100644
--- a/drivers/watchdog/ts72xx_wdt.c
+++ b/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");