[power] Make sure ACPI prepares a console during S3.

Orginally from Pavel Machek.

diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 84160ebbc7496d2395c834a7ffe92f913c96dfd8..5407fcc3e82d3f7c0197e278779f4b7728b3b2f0 100644 (file)
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -226,13 +226,15 @@ acpi_suspend (
        if (state == ACPI_STATE_S4 && !acpi_gbl_FACS->S4bios_f)
                return AE_ERROR;
 
+       pm_prepare_console();
+
        /*
         * TBD: S1 can be done without device_suspend.  Make a CONFIG_XX
         * to handle however when S1 failed without device_suspend.
         */
        if (freeze_processes()) {
-               thaw_processes();
-               return AE_ERROR;                /* device_suspend needs processes to be stopped */
+               status = AE_ERROR;
+               goto Done;
        }
 
        /* do we have a wakeup address for S2 and S3? */
@@ -269,8 +271,10 @@ acpi_suspend (
 
        /* reset firmware waking vector */
        acpi_set_firmware_waking_vector((acpi_physical_address) 0);
-       thaw_processes();
 
+ Done:
+       thaw_processes();
+       pm_restore_console();
        return status;
 }