diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-30 14:16:03 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-30 14:16:03 +0200 |
| commit | f41b83126cba53849dd2353476a7715613af648f (patch) | |
| tree | 582b81ee2f4a8de39db7c58e12dd09a57f62b208 /drivers/cpufreq/cpufreq_conservative.c | |
| parent | 499aa70a016591e4db5f51745e554aae4471c12a (diff) | |
| parent | 6932078376e2c1fd49b6c4aa41cc5e162ee83d8a (diff) | |
| download | linux-f41b83126cba53849dd2353476a7715613af648f.tar.gz linux-f41b83126cba53849dd2353476a7715613af648f.tar.bz2 linux-f41b83126cba53849dd2353476a7715613af648f.zip | |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
cpufreq: Don't use smp_processor_id() in preemptible context
cpufreq: governor: Fix typos in comments
cpufreq: governors: Remove duplicate check of target freq in supported range
cpufreq: Fix timer/workqueue corruption due to double queueing
cpufreq: imx6q: Fix clock enable balance
cpufreq: tegra: fix the wrong clock name
Diffstat (limited to 'drivers/cpufreq/cpufreq_conservative.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq_conservative.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index 7f67a75b3c3c..f62d822048e6 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c @@ -67,8 +67,6 @@ static void cs_check_cpu(int cpu, unsigned int load) return; dbs_info->requested_freq += get_freq_target(cs_tuners, policy); - if (dbs_info->requested_freq > policy->max) - dbs_info->requested_freq = policy->max; __cpufreq_driver_target(policy, dbs_info->requested_freq, CPUFREQ_RELATION_H); @@ -89,8 +87,6 @@ static void cs_check_cpu(int cpu, unsigned int load) return; dbs_info->requested_freq -= get_freq_target(cs_tuners, policy); - if (dbs_info->requested_freq < policy->min) - dbs_info->requested_freq = policy->min; __cpufreq_driver_target(policy, dbs_info->requested_freq, CPUFREQ_RELATION_L); |