msm: pm-8x60: Fix bug where device enter low power mode
An incorrect ordering in the check of allowed modes, results in
standalone power collapse not getting selected when the secondary
cores are online.
Change-Id: Idc7177b78bd0ce7563cc27afbf6c12d3bc1f9f9a
Signed-off-by: Mahesh Sivasubramanian <msivasub@codeaurora.org>
diff --git a/arch/arm/mach-msm/pm-8x60.c b/arch/arm/mach-msm/pm-8x60.c
index fb869cf..89b8c92 100644
--- a/arch/arm/mach-msm/pm-8x60.c
+++ b/arch/arm/mach-msm/pm-8x60.c
@@ -787,6 +787,7 @@
switch (mode) {
case MSM_PM_SLEEP_MODE_POWER_COLLAPSE:
+ case MSM_PM_SLEEP_MODE_RETENTION:
if (!allow)
break;
@@ -806,15 +807,6 @@
}
/* fall through */
- case MSM_PM_SLEEP_MODE_RETENTION:
- if (!allow)
- break;
- if (num_online_cpus() > 1) {
- allow = false;
- break;
- }
- /* fall through */
-
case MSM_PM_SLEEP_MODE_WAIT_FOR_INTERRUPT:
if (!allow)
break;