Merge branch '4.0.8-rt6'

[zynq/linux.git] / kernel / power / suspend.c

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index f77c948ce88c573c6912504c922ea96a5517f029..ebe26cb0d63f614a31d285df5f5df275141935c5 100644 (file)
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -350,6 +350,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
        arch_suspend_disable_irqs();
        BUG_ON(!irqs_disabled());
 
+       system_state = SYSTEM_SUSPEND;
+
        error = syscore_suspend();
        if (!error) {
                *wakeup = pm_wakeup_pending();
@@ -365,6 +367,7 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
        }
 
        clockevents_notify(CLOCK_EVT_NOTIFY_RESUME, NULL);
+       system_state = SYSTEM_RUNNING;
 
        arch_suspend_enable_irqs();
        BUG_ON(irqs_disabled());