1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 6f23ebb395f1..e35a886e00bc 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1530,17 +1530,16 @@ static unsigned int __cpufreq_get(struct cpufreq_policy *policy)
 {
         unsigned int ret_freq = 0;
 
-        if (!cpufreq_driver->get)
+        if (unlikely(policy_is_inactive(policy)) || !cpufreq_driver->get)
                 return ret_freq;
 
         ret_freq = cpufreq_driver->get(policy->cpu);
 
         /*
-         * Updating inactive policies is invalid, so avoid doing that.  Also
-         * if fast frequency switching is used with the given policy, the check
+         * If fast frequency switching is used with the given policy, the check
          * against policy->cur is pointless, so skip it in that case too.
          */
-        if (unlikely(policy_is_inactive(policy)) || policy->fast_switch_enabled)
+        if (policy->fast_switch_enabled)
                 return ret_freq;
 
         if (ret_freq && policy->cur &&
@@ -1569,10 +1568,7 @@ unsigned int cpufreq_get(unsigned int cpu)
 
         if (policy) {
                 down_read(&policy->rwsem);
-
-                if (!policy_is_inactive(policy))
-                        ret_freq = __cpufreq_get(policy);
-
+                ret_freq = __cpufreq_get(policy);
                 up_read(&policy->rwsem);
 
                 cpufreq_cpu_put(policy);