diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-08 01:23:58 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-08 01:32:41 +0100 |
| commit | d4faadd5d5b368a7051fef374ee933ec3606713b (patch) | |
| tree | 41b4142ae490e8fbd43c5d31548458fe4c818b15 | |
| parent | 12205a4b79bef56ef618a4b7caa840c5c971cff2 (diff) | |
| download | kernel-common-d4faadd5d5b368a7051fef374ee933ec3606713b.tar.gz kernel-common-d4faadd5d5b368a7051fef374ee933ec3606713b.tar.bz2 kernel-common-d4faadd5d5b368a7051fef374ee933ec3606713b.zip | |
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 <ziegler@uni-freiburg.de>
Cc: 3.12+ <stable@vger.kernel.org> # 3.12+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 3 |
1 files changed, 3 insertions, 0 deletions
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); |