commit 9cf6a437334f2cbebb363ecb74d89fe2d9d3e256
author Linux Build Service Account <lnxbuild@localhost> Thu Mar 06 02:37:19 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Mar 06 02:37:13 2014 -0800
tree 7dc6220bc5019d32e80a1080609099b72028c76f
parent 3ae1ac138987a3b8f1430507384e928d847a263b
parent ea1c5942fafde6d53a35da355d1fbc1352185cfc

Merge "msm: lpm_levels: Fix incorrect computation of next wakeup time"

arch/arm/mach-msm/lpm_levels.c

diff --git a/arch/arm/mach-msm/lpm_levels.c b/arch/arm/mach-msm/lpm_levels.c
index 7128017..9857162 100644
--- a/arch/arm/mach-msm/lpm_levels.c
+++ b/arch/arm/mach-msm/lpm_levels.c
@@ -526,7 +526,7 @@
 		if (latency_us < pwr->latency_us)
 			continue;
 
-		if (next_event_us)
+		if (next_event_us) {
 			if (next_event_us < pwr->latency_us)
 				continue;
 
@@ -535,6 +535,7 @@
 				next_wakeup_us = next_event_us
 					- pwr->latency_us;
 			}
+		}
 
 		if (next_wakeup_us <= pwr->time_overhead_us)
 			continue;