diff options
author | Tony Lindgren <tony@atomide.com> | 2010-02-17 14:08:58 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-02-17 14:08:58 -0800 |
commit | 80c20d543d142ee54ec85259b77aaf0b83c32db5 (patch) | |
tree | 364017b2c001939bbb645dcc20d565c1f71b13a8 /drivers/cpufreq | |
parent | d6a2d9b800276140abf352908abbd0c240890692 (diff) | |
parent | b72c7d543589736d43da531566490dd31572f5ca (diff) | |
download | kernel_replicant_linux-80c20d543d142ee54ec85259b77aaf0b83c32db5.tar.gz kernel_replicant_linux-80c20d543d142ee54ec85259b77aaf0b83c32db5.tar.bz2 kernel_replicant_linux-80c20d543d142ee54ec85259b77aaf0b83c32db5.zip |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r-- | drivers/cpufreq/cpufreq_ondemand.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index 4b34ade2332b..bd444dc93cf2 100644 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c @@ -554,6 +554,9 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) (dbs_tuners_ins.up_threshold - dbs_tuners_ins.down_differential); + if (freq_next < policy->min) + freq_next = policy->min; + if (!dbs_tuners_ins.powersave_bias) { __cpufreq_driver_target(policy, freq_next, CPUFREQ_RELATION_L); |