commit 9b5c8a261739aa45dd2b8c9e1d6e3b0132e4278e
author Linux Build Service Account <lnxbuild@quicinc.com> Mon Jul 24 01:37:07 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jul 24 01:37:07 2017 -0700
tree 90811f30e7aeaa392ab4e7044d6d36f205a57cf4
parent 3483aeea05d255fa6422c330875a452c0eb03978
parent 1f3e4d5158bffcf0e7adfc0724f3f90882ebd775

Merge "lpm-levels: Do not consider cluster residency in suspend"

drivers/cpuidle/lpm-levels.c

diff --git a/drivers/cpuidle/lpm-levels.c b/drivers/cpuidle/lpm-levels.c
index c00c103..27087a7 100644
--- a/drivers/cpuidle/lpm-levels.c
+++ b/drivers/cpuidle/lpm-levels.c
@@ -957,8 +957,9 @@
 
 		best_level = i;
 
-		if (predicted ? (pred_us <= pwr_params->max_residency)
-			: (sleep_us <= pwr_params->max_residency))
+		if (from_idle &&
+			(predicted ? (pred_us <= pwr_params->max_residency)
+			: (sleep_us <= pwr_params->max_residency)))
 			break;
 	}