From: Rafael J. Wysocki Date: Sun, 8 Dec 2013 00:23:58 +0000 (+0100) Subject: Revert "cpufreq: fix garbage kobjects on errors during suspend/resume" X-Git-Tag: Ubuntu-5.2.0-15.16~14383^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d4faadd5d5b368a7051fef374ee933ec3606713b;p=mirror_ubuntu-eoan-kernel.git Revert "cpufreq: fix garbage kobjects on errors during suspend/resume" Commit 2167e2399dc5 (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: 2167e2399dc5 (cpufreq: fix garbage kobjects on errors during suspend/resume) References: https://bugzilla.kernel.org/show_bug.cgi?id=66751 Reported-by: Martin Ziegler Cc: 3.12+ # 3.12+ Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index b7c3b877da44..02d534da22dd 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -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);