commit 031ac9a0ba2c1ca9e270eac440a28ed93a5ae984
author Linux Build Service Account <lnxbuild@localhost> Thu May 03 00:49:46 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Thu May 03 00:49:46 2012 -0700
tree 8a21ed8232d8b532c6dfccfa54e3503adb1797d9
parent d7da98373208e6e0327c9bf75e5958aa7481314d
parent 76f08e0614caab780a397246a51a03994f0abbf0

Merge "msm: msm_watchdog: Don't pet the watchdog if it isn't enabled" into msm-3.0

arch/arm/mach-msm/msm_watchdog.c

diff --git a/arch/arm/mach-msm/msm_watchdog.c b/arch/arm/mach-msm/msm_watchdog.c
index aabb644..9b8bc61 100644
--- a/arch/arm/mach-msm/msm_watchdog.c
+++ b/arch/arm/mach-msm/msm_watchdog.c
@@ -217,6 +217,9 @@
 	unsigned long long slack_ns;
 	unsigned long long bark_time_ns = bark_time * 1000000ULL;
 
+	if (!enable)
+		return;
+
 	slack = __raw_readl(msm_tmr0_base + WDT0_STS) >> 3;
 	slack = ((bark_time*WDT_HZ)/1000) - slack;
 	if (slack < min_slack_ticks)