| commit | 6be5af632ac9e20033f1a907308fda82544b4f33 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Mon Aug 13 17:46:27 2012 -0700 |
| committer | QuIC Gerrit Code Review <code-review@localhost> | Mon Aug 13 17:46:27 2012 -0700 |
| tree | 441480da1649cdd5b3faa5daa541ede3065667c8 | |
| parent | cd73883b11609aea16ba54babef8a849e446e165 [diff] | |
| parent | bda742700a06fa79956726a12266a3c848aa4bf4 [diff] |
Merge "msm: pm-8x60: Unconditionally support WFI hotplug" into msm-3.4
diff --git a/arch/arm/mach-msm/pm-8x60.c b/arch/arm/mach-msm/pm-8x60.c index e203667..d73764f 100644 --- a/arch/arm/mach-msm/pm-8x60.c +++ b/arch/arm/mach-msm/pm-8x60.c
@@ -819,7 +819,7 @@ msm_pm_power_collapse_standalone(false); else if (allow[MSM_PM_SLEEP_MODE_RETENTION]) msm_pm_retention(); - else if (allow[MSM_PM_SLEEP_MODE_WAIT_FOR_INTERRUPT]) + else msm_pm_swfi(); }