diff options
| -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 */ |