diff options
Diffstat (limited to 'kernel/power/main.c')
-rw-r--r-- | kernel/power/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 868028280d13..2f6638ee03c0 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -295,7 +295,7 @@ static int suspend_enter(suspend_state_t state) | |||
295 | return error; | 295 | return error; |
296 | } | 296 | } |
297 | 297 | ||
298 | error = device_power_down(PMSG_SUSPEND); | 298 | error = device_suspend_noirq(PMSG_SUSPEND); |
299 | if (error) { | 299 | if (error) { |
300 | printk(KERN_ERR "PM: Some devices failed to power down\n"); | 300 | printk(KERN_ERR "PM: Some devices failed to power down\n"); |
301 | goto Platfrom_finish; | 301 | goto Platfrom_finish; |
@@ -335,7 +335,7 @@ static int suspend_enter(suspend_state_t state) | |||
335 | suspend_ops->wake(); | 335 | suspend_ops->wake(); |
336 | 336 | ||
337 | Power_up_devices: | 337 | Power_up_devices: |
338 | device_power_up(PMSG_RESUME); | 338 | device_resume_noirq(PMSG_RESUME); |
339 | 339 | ||
340 | Platfrom_finish: | 340 | Platfrom_finish: |
341 | if (suspend_ops->finish) | 341 | if (suspend_ops->finish) |