summaryrefslogtreecommitdiffstats
path: root/drivers/base/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-08 01:04:17 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-08 01:04:17 +0100
commit12205a4b79bef56ef618a4b7caa840c5c971cff2 (patch)
treefea1a7f7af347e5e2766031a77286e7556b38d2e /drivers/base/power
parent374b105797c3d4f29c685f3be535c35f5689b30e (diff)
downloadop-kernel-dev-12205a4b79bef56ef618a4b7caa840c5c971cff2.zip
op-kernel-dev-12205a4b79bef56ef618a4b7caa840c5c971cff2.tar.gz
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 e3219df..1b41fca 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -29,7 +29,6 @@
#include <linux/async.h>
#include <linux/suspend.h>
#include <trace/events/power.h>
-#include <linux/cpufreq.h>
#include <linux/cpuidle.h>
#include <linux/timer.h>
@@ -541,7 +540,6 @@ static void dpm_resume_noirq(pm_message_t state)
dpm_show_time(starttime, state, "noirq");
resume_device_irqs();
cpuidle_resume();
- cpufreq_resume();
}
/**
@@ -957,7 +955,6 @@ static int dpm_suspend_noirq(pm_message_t state)
ktime_t starttime = ktime_get();
int error = 0;
- cpufreq_suspend();
cpuidle_pause();
suspend_device_irqs();
mutex_lock(&dpm_list_mtx);
OpenPOWER on IntegriCloud