From: zhuguangqing <[email protected]>

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.

Signed-off-by: zhuguangqing <[email protected]>
---
 drivers/thermal/cpufreq_cooling.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/thermal/cpufreq_cooling.c 
b/drivers/thermal/cpufreq_cooling.c
index cc2959f22f01..00dc26c33899 100644
--- a/drivers/thermal/cpufreq_cooling.c
+++ b/drivers/thermal/cpufreq_cooling.c
@@ -438,13 +438,12 @@ 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;
-- 
2.17.1

Reply via email to