Commit b1b12bab authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: update 'cpufreq_suspended' after stopping governors

Commit 8e30444e ("cpufreq: fix cpufreq suspend/resume for intel_pstate")
introduced a bug where the governors wouldn't be stopped anymore for
->target{_index}() drivers during suspend. This happens because
'cpufreq_suspended' is updated before stopping the governors during suspend
and due to this __cpufreq_governor() would return early due to this check:

	/* Don't start any governor operations if we are entering suspend */
	if (cpufreq_suspended)
		return 0;

Fixes: 8e30444e ("cpufreq: fix cpufreq suspend/resume for intel_pstate")
Cc: 3.15+ <> # 3.15+: 8e30444e

 "cpufreq: fix cpufreq suspend/resume for intel_pstate"
Signed-off-by: default avatarViresh Kumar <>
Signed-off-by: default avatarRafael J. Wysocki <>
parent d62dbf77
......@@ -1658,10 +1658,8 @@ void cpufreq_suspend(void)
if (!cpufreq_driver)
cpufreq_suspended = true;
if (!has_target())
goto suspend;
pr_debug("%s: Suspending Governors\n", __func__);
......@@ -1674,6 +1672,9 @@ void cpufreq_suspend(void)
pr_err("%s: Failed to suspend driver: %p\n", __func__,
cpufreq_suspended = true;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment