From: Zhuguangqing zhuguangqing@xiaomi.com

If state has not changed successfully and we updated cpufreq_state, next time when the new state is equal to cpufreq_state (not changed successfully last time), we will return directly and miss a freq_qos_update_request() that should have been.

Fixes: 5130802ddbb1 ("thermal: cpu_cooling: Switch to QoS requests for freq limits") Cc: v5.4+ stable@vger.kernel.org # v5.4+ Signed-off-by: Zhuguangqing zhuguangqing@xiaomi.com Acked-by: Viresh Kumar viresh.kumar@linaro.org --- v2: - Add Fixes: 5130802ddbb1 in log. - Add Cc: v5.4+ stable@vger.kernel.org # v5.4+ in log. - Add Acked-by: Viresh Kumar viresh.kumar@linaro.org in log. - Delete an extra blank line. --- drivers/thermal/cpufreq_cooling.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/thermal/cpufreq_cooling.c b/drivers/thermal/cpufreq_cooling.c index cc2959f22f01..612f063c1cfc 100644 --- a/drivers/thermal/cpufreq_cooling.c +++ b/drivers/thermal/cpufreq_cooling.c @@ -438,13 +438,11 @@ static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev, if (cpufreq_cdev->cpufreq_state == state) return 0;

- cpufreq_cdev->cpufreq_state = state; - frequency = get_state_freq(cpufreq_cdev, state);

ret = freq_qos_update_request(&cpufreq_cdev->qos_req, frequency); - if (ret > 0) { + cpufreq_cdev->cpufreq_state = state; cpus = cpufreq_cdev->policy->cpus; max_capacity = arch_scale_cpu_capacity(cpumask_first(cpus)); capacity = frequency * max_capacity;