aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-07-07 17:43:18 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2010-07-18 20:00:35 -0400
commitf6f71f187518477cecc01cd887933b5da19585e6 (patch)
treed59705a937ca35d241f274a0db772e688ff9191a /kernel/power
parent82f682514a5df89ffb3890627eebf0897b7a84ec (diff)
PM / Hibernate: Fix hibernation_platform_enter()
The hibernation_platform_enter() function calls dpm_suspend_noirq() instead of dpm_resume_noirq() by mistake. Fix this. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/hibernate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index f61202916631..d97ba8615c30 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -530,7 +530,7 @@ int hibernation_platform_enter(void)
530 Platform_finish: 530 Platform_finish:
531 hibernation_ops->finish(); 531 hibernation_ops->finish();
532 532
533 dpm_suspend_noirq(PMSG_RESTORE); 533 dpm_resume_noirq(PMSG_RESTORE);
534 534
535 Resume_devices: 535 Resume_devices:
536 entering_platform_hibernation = false; 536 entering_platform_hibernation = false;