summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLifeng Zheng <zhenglifeng1@huawei.com>2025-07-09 18:41:45 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2025-07-14 19:38:10 +0200
commit0ae204405095abfbc2d694ee0fbb49bcbbe55c57 (patch)
tree640aa60eab69bbadbcc2c63c2bc6f1f1786b64fc
parent908981d85f86c5e2b39dfe0b2267c6d44d9c48f7 (diff)
cpufreq: Exit governor when failed to start old governor
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>
-rw-r--r--drivers/cpufreq/cpufreq.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 84f175a55fc5..d24ad67b3f1e 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2711,10 +2711,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;