summaryrefslogtreecommitdiff
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorAntti P Miettinen <amiettinen@nvidia.com>2012-03-20 13:50:50 +0200
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-03-21 09:12:51 -0700
commit63942d237b33b6029e0afedaaef82c5768a147cf (patch)
treef962af03c2c7559e647f131d5515bc39e413efc3 /drivers/cpufreq
parent806fff65dfa3f000316ccaafda53b9183700243e (diff)
cpufreq: Typecast compared integers
The min/max frequencies in cpufreq_policy are unsigned integers but pm_qos_request() returns a signed int. Compare as unsigned, frequencies are never negative. Bug 949219 Change-Id: Iba0de9ad6bf221f7a2e5560f597aa56cbeb7b6f6 Signed-off-by: Antti P Miettinen <amiettinen@nvidia.com> Reviewed-on: http://git-master/r/91214 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r--drivers/cpufreq/cpufreq.c8
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);