diff options
Diffstat (limited to 'drivers/base/power/main.c')
-rw-r--r-- | drivers/base/power/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 9cb845e49334..63048f79de5f 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
29 | #include <linux/async.h> | 29 | #include <linux/async.h> |
30 | #include <linux/suspend.h> | 30 | #include <linux/suspend.h> |
31 | 31 | #include <linux/cpuidle.h> | |
32 | #include "../base.h" | 32 | #include "../base.h" |
33 | #include "power.h" | 33 | #include "power.h" |
34 | 34 | ||
@@ -467,6 +467,7 @@ static void dpm_resume_noirq(pm_message_t state) | |||
467 | mutex_unlock(&dpm_list_mtx); | 467 | mutex_unlock(&dpm_list_mtx); |
468 | dpm_show_time(starttime, state, "noirq"); | 468 | dpm_show_time(starttime, state, "noirq"); |
469 | resume_device_irqs(); | 469 | resume_device_irqs(); |
470 | cpuidle_resume(); | ||
470 | } | 471 | } |
471 | 472 | ||
472 | /** | 473 | /** |
@@ -867,6 +868,7 @@ static int dpm_suspend_noirq(pm_message_t state) | |||
867 | ktime_t starttime = ktime_get(); | 868 | ktime_t starttime = ktime_get(); |
868 | int error = 0; | 869 | int error = 0; |
869 | 870 | ||
871 | cpuidle_pause(); | ||
870 | suspend_device_irqs(); | 872 | suspend_device_irqs(); |
871 | mutex_lock(&dpm_list_mtx); | 873 | mutex_lock(&dpm_list_mtx); |
872 | while (!list_empty(&dpm_late_early_list)) { | 874 | while (!list_empty(&dpm_late_early_list)) { |