diff options
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index a76470358e77..96adadf59e9e 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1633,10 +1633,14 @@ static int __cpufreq_set_policy(struct cpufreq_policy *data, struct cpufreq_policy *policy) { int ret = 0; + unsigned int qmin, qmax; unsigned int pmin = policy->min; unsigned int pmax = policy->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); + + qmin = min((unsigned int)pm_qos_request(PM_QOS_CPU_FREQ_MIN), + data->max); + qmax = max((unsigned int)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); |