aboutsummaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-04-23 23:55:23 +0100
committerMark Brown <broonie@linaro.org>2014-04-23 23:55:23 +0100
commit08a92bdc033b579656887b1621511bcefa38dfab (patch)
treebeb9d95ff096619d3c11c0b6c84962d82bb2fbb0 /drivers/base
parent70830c6164e73518b82719e1e73746cfc984c4dd (diff)
parentadb665056afe23db0687c1d1a208806c108add08 (diff)
Merge branch 'v3.10/topic/cpufreq' of git://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lsk
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/main.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 5a9b6569dd74..220ec3a3ca75 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -28,6 +28,8 @@
#include <linux/sched.h>
#include <linux/async.h>
#include <linux/suspend.h>
+#include <trace/events/power.h>
+#include <linux/cpufreq.h>
#include <linux/cpuidle.h>
#include "../base.h"
#include "power.h"
@@ -713,6 +715,8 @@ void dpm_resume(pm_message_t state)
mutex_unlock(&dpm_list_mtx);
async_synchronize_full();
dpm_show_time(starttime, state, NULL);
+
+ cpufreq_resume();
}
/**
@@ -1177,6 +1181,8 @@ int dpm_suspend(pm_message_t state)
might_sleep();
+ cpufreq_suspend();
+
mutex_lock(&dpm_list_mtx);
pm_transition = state;
async_error = 0;