diff --git a/[refs] b/[refs] index c0e6eb9f00ac..10174d2e9627 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82f682514a5df89ffb3890627eebf0897b7a84ec +refs/heads/master: f6f71f187518477cecc01cd887933b5da19585e6 diff --git a/trunk/kernel/power/hibernate.c b/trunk/kernel/power/hibernate.c index f61202916631..d97ba8615c30 100644 --- a/trunk/kernel/power/hibernate.c +++ b/trunk/kernel/power/hibernate.c @@ -530,7 +530,7 @@ int hibernation_platform_enter(void) Platform_finish: hibernation_ops->finish(); - dpm_suspend_noirq(PMSG_RESTORE); + dpm_resume_noirq(PMSG_RESTORE); Resume_devices: entering_platform_hibernation = false;