1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 7498c35266ee..1a74bc7fb458 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -135,6 +135,13 @@ static int omap_wdt_start(struct watchdog_device *wdog)
 
         pm_runtime_get_sync(wdev->dev);
 
+        /*
+         * Make sure the watchdog is disabled. This is unfortunately required
+         * because writing to various registers with the watchdog running has no
+         * effect.
+         */
+        omap_wdt_disable(wdev);
+
         /* initialize prescaler */
         while (readl_relaxed(base + OMAP_WATCHDOG_WPS) & 0x01)
                 cpu_relax();