diff options
author | Jinyoung Park <jinyoungp@nvidia.com> | 2013-09-02 14:39:34 +0900 |
---|---|---|
committer | Gabby Lee <galee@nvidia.com> | 2013-09-02 06:37:35 -0700 |
commit | 7f53b0accdf31b0e58b883e6bab1a4e71fa429be (patch) | |
tree | 34a93e54ec1d72bc3c82006b8f71884cbe687f66 | |
parent | 107001b0b70d39a489fe7d708af01a475ff2cc56 (diff) |
cpufreq: conservative: Ensure requested_freq within policy min/max range
Ensure requested_freq within policy min/max reage.
Bug 1354391
Change-Id: I55d0221a228c3cdeef3f9ced0a0ecb8bbdb21427
Signed-off-by: Jinyoung Park <jinyoungp@nvidia.com>
Reviewed-on: http://git-master/r/268953
Reviewed-by: Gabby Lee <galee@nvidia.com>
Tested-by: Gabby Lee <galee@nvidia.com>
-rw-r--r-- | drivers/cpufreq/cpufreq_conservative.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index 4c69fbfa9774..7ae376e70adc 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c @@ -411,6 +411,10 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) if (this_dbs_info->requested_freq > policy->max) this_dbs_info->requested_freq = policy->max; + /* Ensure requested_freq within policy min/max range. */ + this_dbs_info->requested_freq = + max(policy->min, this_dbs_info->requested_freq); + __cpufreq_driver_target(policy, this_dbs_info->requested_freq, CPUFREQ_RELATION_H); return; @@ -430,6 +434,10 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) } else this_dbs_info->requested_freq = policy->min; + /* Ensure requested_freq within policy min/max range. */ + this_dbs_info->requested_freq = + min(policy->max, this_dbs_info->requested_freq); + /* * if we cannot reduce the frequency anymore, break out early */ |