cpufreq: Exit governor when failed to start old governor

[ Upstream commit 0ae204405095abfbc2d694ee0fbb49bcbbe55c57 ]

Detect the result of starting old governor in cpufreq_set_policy(). If it
fails, exit the governor and clear policy->governor.

Signed-off-by: Lifeng Zheng <zhenglifeng1@huawei.com>
Link: https://patch.msgid.link/20250709104145.2348017-5-zhenglifeng1@huawei.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 805b4d26e9d21cbbd65997eb39b0e8a50e906c09..90bdccab1dffbb9350f9682464af899c42348740 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2649,10 +2649,12 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy,
        pr_debug("starting governor %s failed\n", policy->governor->name);
        if (old_gov) {
                policy->governor = old_gov;
-               if (cpufreq_init_governor(policy))
+               if (cpufreq_init_governor(policy)) {
                        policy->governor = NULL;
-               else
-                       cpufreq_start_governor(policy);
+               } else if (cpufreq_start_governor(policy)) {
+                       cpufreq_exit_governor(policy);
+                       policy->governor = NULL;
+               }
        }
 
        return ret;