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 6e93e7f9835848e50b8fc691f7953cca0ac1e593..61190f6b48299ae7f89dbf6933b5e3d2333d84c1 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1658,10 +1658,8 @@ void cpufreq_suspend(void)
        if (!cpufreq_driver)
                return;
 
-       cpufreq_suspended = true;
-
        if (!has_target())
-               return;
+               goto suspend;
 
        pr_debug("%s: Suspending Governors\n", __func__);
 
@@ -1674,6 +1672,9 @@ void cpufreq_suspend(void)
                        pr_err("%s: Failed to suspend driver: %p\n", __func__,
                                policy);
        }
+
+suspend:
+       cpufreq_suspended = true;
 }
 
 /**