1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 65f469145950..ab0c4e0165d1 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -213,7 +213,15 @@ static int at91_wdt_init(struct platform_device *pdev, struct at91wdt *wdt)
                          tmp & wdt->mr_mask, wdt->mr & wdt->mr_mask);
 
         setup_timer(&wdt->timer, at91_ping, (unsigned long)wdt);
-        mod_timer(&wdt->timer, jiffies + wdt->heartbeat);
+
+        /*
+         * Use min_heartbeat the first time to avoid spurious watchdog reset:
+         * we don't know for how long the watchdog counter is running, and
+         *  - resetting it right now might trigger a watchdog fault reset
+         *  - waiting for heartbeat time might lead to a watchdog timeout
+         *    reset
+         */
+        mod_timer(&wdt->timer, jiffies + min_heartbeat);
 
         /* Try to set timeout from device tree first */
         if (watchdog_init_timeout(&wdt->wdd, 0, dev))