diff options
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 698bf4aee6f8..a76470358e77 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1635,8 +1635,8 @@ static int __cpufreq_set_policy(struct cpufreq_policy *data, int ret = 0; unsigned int pmin = policy->min; unsigned int pmax = policy->max; - unsigned int qmin = pm_qos_request(PM_QOS_CPU_FREQ_MIN); - unsigned int qmax = pm_qos_request(PM_QOS_CPU_FREQ_MAX); + unsigned int qmin = min(pm_qos_request(PM_QOS_CPU_FREQ_MIN), data->max); + unsigned int qmax = max(pm_qos_request(PM_QOS_CPU_FREQ_MAX), data->min); pr_debug("setting new policy for CPU %u: %u - %u (%u - %u) kHz\n", policy->cpu, pmin, pmax, qmin, qmax); |