Merge tag 'omap-fixes-audio-clock-and-modem-signed' of git://git.kernel.org/pub/scm...

[platform/kernel/linux-rpi.git] / kernel / sched / cpufreq_schedutil.c

diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index 4492608..458d359 100644 (file)
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -350,7 +350,8 @@ static void sugov_update_single_freq(struct update_util_data *hook, u64 time,
         * Except when the rq is capped by uclamp_max.
         */
        if (!uclamp_rq_is_capped(cpu_rq(sg_cpu->cpu)) &&
-           sugov_cpu_is_busy(sg_cpu) && next_f < sg_policy->next_freq) {
+           sugov_cpu_is_busy(sg_cpu) && next_f < sg_policy->next_freq &&
+           !sg_policy->need_freq_update) {
                next_f = sg_policy->next_freq;
 
                /* Restore cached freq as next_freq has changed */