ARM: tegra: Maintain state of WDT after resume same as before suspend

Do not start WDT in resume if it was not running before suspend.

Bug 1737038

Change-Id: I18d56b86561220fe109f8f5e28aa2f0ebc901fae
Signed-off-by: Gagan Grover <ggrover@nvidia.com>
Reviewed-on: http://git-master/r/1026416
(cherry picked from commit b06471f35627c0897bb2597fb2b071baa1665c35)
Reviewed-on: http://git-master/r/1026593
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>

diff --git a/drivers/watchdog/max77620_wdt.c b/drivers/watchdog/max77620_wdt.c
index b859001ee44de742c450852c7c955975e624fdd8..088e389dbd1949590d9c830d3ff08e4ee5d85403 100644 (file)
--- a/drivers/watchdog/max77620_wdt.c
+++ b/drivers/watchdog/max77620_wdt.c
@@ -1,7 +1,7 @@
 /*
  * Watchdog timer for Max77620 PMIC.
  *
- * Copyright (c) 2014, NVIDIA Corporation. All rights reserved.
+ * Copyright (c) 2014-2016, NVIDIA Corporation. All rights reserved.
  *
  * Author: Chaitanya Bandi <bandik@nvidia.com>
  *
@@ -578,6 +578,7 @@ static int max77620_wdt_resume(struct device *dev)
                ret = max77620_wdt_stop(&wdt->wdt_dev);
                if (ret < 0)
                        dev_err(wdt->dev, "wdt stop failed: %d\n", ret);
+               wdt->current_timeout = 0;
                return ret;
        }