aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-07 19:04:17 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-07 19:04:17 -0500
commit12205a4b79bef56ef618a4b7caa840c5c971cff2 (patch)
treefea1a7f7af347e5e2766031a77286e7556b38d2e /drivers/base/power
parent374b105797c3d4f29c685f3be535c35f5689b30e (diff)
Revert "cpufreq: suspend governors on system suspend/hibernate"
Commit 5a87182aa21d (cpufreq: suspend governors on system suspend/hibernate) causes hibernation problems to happen on Bjørn Mork's and Paul Bolle's systems, so revert it. Fixes: 5a87182aa21d (cpufreq: suspend governors on system suspend/hibernate) Reported-by: Bjørn Mork <bjorn@mork.no> Reported-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/base/power')
-rw-r--r--drivers/base/power/main.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index e3219dfd736c..1b41fca3d65a 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -29,7 +29,6 @@
29#include <linux/async.h> 29#include <linux/async.h>
30#include <linux/suspend.h> 30#include <linux/suspend.h>
31#include <trace/events/power.h> 31#include <trace/events/power.h>
32#include <linux/cpufreq.h>
33#include <linux/cpuidle.h> 32#include <linux/cpuidle.h>
34#include <linux/timer.h> 33#include <linux/timer.h>
35 34
@@ -541,7 +540,6 @@ static void dpm_resume_noirq(pm_message_t state)
541 dpm_show_time(starttime, state, "noirq"); 540 dpm_show_time(starttime, state, "noirq");
542 resume_device_irqs(); 541 resume_device_irqs();
543 cpuidle_resume(); 542 cpuidle_resume();
544 cpufreq_resume();
545} 543}
546 544
547/** 545/**
@@ -957,7 +955,6 @@ static int dpm_suspend_noirq(pm_message_t state)
957 ktime_t starttime = ktime_get(); 955 ktime_t starttime = ktime_get();
958 int error = 0; 956 int error = 0;
959 957
960 cpufreq_suspend();
961 cpuidle_pause(); 958 cpuidle_pause();
962 suspend_device_irqs(); 959 suspend_device_irqs();
963 mutex_lock(&dpm_list_mtx); 960 mutex_lock(&dpm_list_mtx);