diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-13 12:06:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-13 12:06:53 +0000 |
| commit | 4cb518ab3d962ac6d0249f47a512127364ddf7da (patch) | |
| tree | 83273e3360c39ec70f0fb3f4f2829b5ce190b6ad /drivers/cpufreq | |
| parent | 47cf66ff098ac408194713be6531a7bb57d1b99b (diff) | |
| parent | 54a3a4d441e9eaceb86989f0b466e77815ab6129 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 6d6a0b48eb7..9520e3b90bd 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -629,8 +629,8 @@ static int __cpuinit intel_pstate_cpu_exit(struct cpufreq_policy *policy) static int __cpuinit intel_pstate_cpu_init(struct cpufreq_policy *policy) { - int rc, min_pstate, max_pstate; struct cpudata *cpu; + int rc; rc = intel_pstate_init_cpu(policy->cpu); if (rc) @@ -644,9 +644,8 @@ static int __cpuinit intel_pstate_cpu_init(struct cpufreq_policy *policy) else policy->policy = CPUFREQ_POLICY_POWERSAVE; - intel_pstate_get_min_max(cpu, &min_pstate, &max_pstate); - policy->min = min_pstate * 100000; - policy->max = max_pstate * 100000; + policy->min = cpu->pstate.min_pstate * 100000; + policy->max = cpu->pstate.turbo_pstate * 100000; /* cpuinfo and default policy values */ policy->cpuinfo.min_freq = cpu->pstate.min_pstate * 100000; |