aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq/cpufreq.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-07 19:23:58 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-07 19:32:41 -0500
commitd4faadd5d5b368a7051fef374ee933ec3606713b (patch)
tree41b4142ae490e8fbd43c5d31548458fe4c818b15 /drivers/cpufreq/cpufreq.c
parent12205a4b79bef56ef618a4b7caa840c5c971cff2 (diff)
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>
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
-rw-r--r--drivers/cpufreq/cpufreq.c3
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,
2076 dev = get_cpu_device(cpu); 2076 dev = get_cpu_device(cpu);
2077 if (dev) { 2077 if (dev) {
2078 2078
2079 if (action & CPU_TASKS_FROZEN)
2080 frozen = true;
2081
2079 switch (action & ~CPU_TASKS_FROZEN) { 2082 switch (action & ~CPU_TASKS_FROZEN) {
2080 case CPU_ONLINE: 2083 case CPU_ONLINE:
2081 __cpufreq_add_dev(dev, NULL, frozen); 2084 __cpufreq_add_dev(dev, NULL, frozen);