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

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

Revert "cpufreq: fix garbage kobjects on errors during suspend/resume" 

Commit 2167e239 (cpufreq: fix garbage kobjects on errors during
suspend/resume) breaks suspend/resume on Martin Ziegler's system
(hard lockup during resume), so revert it.

Fixes: 2167e239 (cpufreq: fix garbage kobjects on errors during suspend/resume)
References: https://bugzilla.kernel.org/show_bug.cgi?id=66751


Reported-by: default avatarMartin Ziegler <ziegler@uni-freiburg.de>
Cc: 3.12+ <stable@vger.kernel.org> # 3.12+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 12205a4b

drivers/cpufreq/cpufreq.c

+3 −0
Original line number Diff line number Diff line
@@ -2076,6 +2076,9 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb, 
	dev = get_cpu_device(cpu);

	if (dev) {



		if (action & CPU_TASKS_FROZEN)

			frozen = true;



		switch (action & ~CPU_TASKS_FROZEN) {

		case CPU_ONLINE:

			__cpufreq_add_dev(dev, NULL, frozen);