cpufreq: resume drivers before enabling governors

During suspend, we first stop governors and then suspend cpufreq drivers and
resume must be exactly opposite of that. i.e. resume drivers first and then
start governors.

But the current code in resume enables governors first and then resume drivers.
Fix it be changing code sequence there.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 3aa7a7a226b3..d8d6bc9d1815 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1652,14 +1652,13 @@ void cpufreq_resume(void)
         cpufreq_suspended = false;
 
         list_for_each_entry(policy, &cpufreq_policy_list, policy_list) {
-                if (__cpufreq_governor(policy, CPUFREQ_GOV_START)
+                if (cpufreq_driver->resume && cpufreq_driver->resume(policy))
+                        pr_err("%s: Failed to resume driver: %p\n", __func__,
+                                policy);
+                else if (__cpufreq_governor(policy, CPUFREQ_GOV_START)
                     || __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS))
                         pr_err("%s: Failed to start governor for policy: %p\n",
                                 __func__, policy);
-                else if (cpufreq_driver->resume
-                    && cpufreq_driver->resume(policy))
-                        pr_err("%s: Failed to resume driver: %p\n", __func__,
-                                policy);
 
                 /*
                  * schedule call cpufreq_update_policy() for boot CPU, i.e. last