aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power/suspend.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/power/suspend.c')
-rw-r--r--kernel/power/suspend.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 4fd51beed879..560a639614a1 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -147,7 +147,7 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
147 goto Platform_finish; 147 goto Platform_finish;
148 } 148 }
149 149
150 error = dpm_suspend_noirq(PMSG_SUSPEND); 150 error = dpm_suspend_end(PMSG_SUSPEND);
151 if (error) { 151 if (error) {
152 printk(KERN_ERR "PM: Some devices failed to power down\n"); 152 printk(KERN_ERR "PM: Some devices failed to power down\n");
153 goto Platform_finish; 153 goto Platform_finish;
@@ -189,7 +189,7 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
189 if (suspend_ops->wake) 189 if (suspend_ops->wake)
190 suspend_ops->wake(); 190 suspend_ops->wake();
191 191
192 dpm_resume_noirq(PMSG_RESUME); 192 dpm_resume_start(PMSG_RESUME);
193 193
194 Platform_finish: 194 Platform_finish:
195 if (suspend_ops->finish) 195 if (suspend_ops->finish)