Merge branch 'pm-sleep'

[firefly-linux-kernel-4.4.55.git] / drivers / cpufreq / cpufreq.c

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index d9fdeddcef96e6b29d5785cb2001e72b8f805248..61190f6b48299ae7f89dbf6933b5e3d2333d84c1 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1289,6 +1289,8 @@ err_get_freq:
                per_cpu(cpufreq_cpu_data, j) = NULL;
        write_unlock_irqrestore(&cpufreq_driver_lock, flags);
 
+       up_write(&policy->rwsem);
+
        if (cpufreq_driver->exit)
                cpufreq_driver->exit(policy);
 err_set_policy_cpu:
@@ -1657,7 +1659,7 @@ void cpufreq_suspend(void)
                return;
 
        if (!has_target())
-               return;
+               goto suspend;
 
        pr_debug("%s: Suspending Governors\n", __func__);
 
@@ -1671,6 +1673,7 @@ void cpufreq_suspend(void)
                                policy);
        }
 
+suspend:
        cpufreq_suspended = true;
 }
 
@@ -1687,13 +1690,13 @@ void cpufreq_resume(void)
        if (!cpufreq_driver)
                return;
 
+       cpufreq_suspended = false;
+
        if (!has_target())
                return;
 
        pr_debug("%s: Resuming Governors\n", __func__);
 
-       cpufreq_suspended = false;
-
        list_for_each_entry(policy, &cpufreq_policy_list, policy_list) {
                if (cpufreq_driver->resume && cpufreq_driver->resume(policy))
                        pr_err("%s: Failed to resume driver: %p\n", __func__,