diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-10-31 01:28:21 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-15 00:33:09 +0100 |
| commit | 7249924e537816368c4a35afd97ab311f75a6368 (patch) | |
| tree | a332ffc88c23988b4add2bab60705357a230b705 /drivers/cpufreq/cpufreq.c | |
| parent | 5a1c022850ea5d64c2997bf9b89f5ae112d5ee4d (diff) | |
| download | linux-3.10-7249924e537816368c4a35afd97ab311f75a6368.tar.gz linux-3.10-7249924e537816368c4a35afd97ab311f75a6368.tar.bz2 linux-3.10-7249924e537816368c4a35afd97ab311f75a6368.zip | |
cpufreq: Make sure target freq is within limits
__cpufreq_driver_target() must not pass target frequency beyond the
limits of current policy.
Today most of cpufreq platform drivers are doing this check in their
target routines. Why not move it to __cpufreq_driver_target()?
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 28dc134cec3..2f5ac2dcfda 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1470,12 +1470,19 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, unsigned int relation) { int retval = -EINVAL; + unsigned int old_target_freq = target_freq; if (cpufreq_disabled()) return -ENODEV; - pr_debug("target for CPU %u: %u kHz, relation %u\n", policy->cpu, - target_freq, relation); + /* Make sure that target_freq is within supported range */ + if (target_freq > policy->max) + target_freq = policy->max; + if (target_freq < policy->min) + target_freq = policy->min; + + pr_debug("target for CPU %u: %u kHz, relation %u, requested %u kHz\n", + policy->cpu, target_freq, relation, old_target_freq); if (target_freq == policy->cur) return 0; |