Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 742c87bf authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

cpufreq: Avoid false-positive WARN_ON()s in cpufreq_update_policy()



CPU notifications from the firmware coming in when cpufreq is
suspended cause cpufreq_update_current_freq() to return 0 which
triggers the WARN_ON() in cpufreq_update_policy() for no reason.

Avoid that by checking cpufreq_suspended before calling
cpufreq_update_current_freq().

Fixes: c9d9c929 (cpufreq: Abort cpufreq_update_current_freq() for cpufreq_suspended set)
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Cc: 4.6+ <stable@vger.kernel.org> # 4.6+
parent ca5eda5d
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -2261,6 +2261,10 @@ int cpufreq_update_policy(unsigned int cpu)
	 * -> ask driver for current freq and notify governors about a change
	 */
	if (cpufreq_driver->get && !cpufreq_driver->setpolicy) {
		if (cpufreq_suspended) {
			ret = -EAGAIN;
			goto unlock;
		}
		new_policy.cur = cpufreq_update_current_freq(policy);
		if (WARN_ON(!new_policy.cur)) {
			ret = -EIO;