diff options
| author | Rafael J. Wysocki <rjw@rjwysocki.net> | 2013-10-25 16:36:40 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@rjwysocki.net> | 2013-10-25 16:36:40 -0400 |
| commit | 6ddee424fea2d269c2f402278d93165c7b92dc58 (patch) | |
| tree | c1b1d0d9058846a6da22def648dea61e16faacd0 /drivers/cpufreq/intel_pstate.c | |
| parent | e4db1c7439b31993a4886b273bb9235a8eea82bf (diff) | |
| parent | a814613b9a32d9ab9578d9dab396265c826d37f0 (diff) | |
Merge back earlier 'pm-cpufreq' material.
Conflicts:
drivers/cpufreq/omap-cpufreq.c
Diffstat (limited to 'drivers/cpufreq/intel_pstate.c')
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index badf6206b2b2..d57648989c0b 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c | |||
| @@ -615,9 +615,7 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) | |||
| 615 | 615 | ||
| 616 | static int intel_pstate_verify_policy(struct cpufreq_policy *policy) | 616 | static int intel_pstate_verify_policy(struct cpufreq_policy *policy) |
| 617 | { | 617 | { |
| 618 | cpufreq_verify_within_limits(policy, | 618 | cpufreq_verify_within_cpu_limits(policy); |
| 619 | policy->cpuinfo.min_freq, | ||
| 620 | policy->cpuinfo.max_freq); | ||
| 621 | 619 | ||
| 622 | if ((policy->policy != CPUFREQ_POLICY_POWERSAVE) && | 620 | if ((policy->policy != CPUFREQ_POLICY_POWERSAVE) && |
| 623 | (policy->policy != CPUFREQ_POLICY_PERFORMANCE)) | 621 | (policy->policy != CPUFREQ_POLICY_PERFORMANCE)) |