1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 3033952391fe..a80bd68bbd74 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -671,11 +671,7 @@ static ssize_t store_scaling_governor(struct cpufreq_policy *policy,
                 return -EINVAL;
 
         ret = cpufreq_set_policy(policy, &new_policy);
-        if (ret)
-                return ret;
-
-        policy->user_policy.policy = policy->policy;
-        return count;
+        return ret ? ret : count;
 }
 
 /**
@@ -1322,9 +1318,6 @@ static int cpufreq_online(unsigned int cpu)
                 goto out_exit_policy;
         }
 
-        if (new_policy)
-                policy->user_policy.policy = policy->policy;
-
         up_write(&policy->rwsem);
 
         kobject_uevent(&policy->kobj, KOBJ_ADD);
@@ -2302,7 +2295,6 @@ int cpufreq_update_policy(unsigned int cpu)
         memcpy(&new_policy, policy, sizeof(*policy));
         new_policy.min = policy->user_policy.min;
         new_policy.max = policy->user_policy.max;
-        new_policy.policy = policy->user_policy.policy;
 
         /*
          * BIOS might change freq behind our back