Merge branch 'linus' into perf/urgent

Merge reason: Fix upstream breakage introduced by:

 de5d9bf: Move list types from <linux/list.h> to <linux/types.h>.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 7 insertions, 6 deletions

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index f37cb7dd4402..7335952ee473 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -136,19 +136,19 @@ static int suspend_enter(suspend_state_t state)
         if (suspend_ops->prepare) {
                 error = suspend_ops->prepare();
                 if (error)
-                        return error;
+                        goto Platform_finish;
         }
 
         error = dpm_suspend_noirq(PMSG_SUSPEND);
         if (error) {
                 printk(KERN_ERR "PM: Some devices failed to power down\n");
-                goto Platfrom_finish;
+                goto Platform_finish;
         }
 
         if (suspend_ops->prepare_late) {
                 error = suspend_ops->prepare_late();
                 if (error)
-                        goto Power_up_devices;
+                        goto Platform_wake;
         }
 
         if (suspend_test(TEST_PLATFORM))
@@ -163,8 +163,10 @@ static int suspend_enter(suspend_state_t state)
 
         error = sysdev_suspend(PMSG_SUSPEND);
         if (!error) {
-                if (!suspend_test(TEST_CORE))
+                if (!suspend_test(TEST_CORE) && pm_check_wakeup_events()) {
                         error = suspend_ops->enter(state);
+                        events_check_enabled = false;
+                }
                 sysdev_resume();
         }
 
@@ -178,10 +180,9 @@ static int suspend_enter(suspend_state_t state)
         if (suspend_ops->wake)
                 suspend_ops->wake();
 
- Power_up_devices:
         dpm_resume_noirq(PMSG_RESUME);
 
- Platfrom_finish:
+ Platform_finish:
         if (suspend_ops->finish)
                 suspend_ops->finish();