ACPI / sleep: remove panic in case hardware has changed after S4

[~andy/linux] / drivers / acpi / sleep.c

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 721e949e606edff0e2b62dc1e4d12e201bbbad4d..32f7dee2f16bbaa231594c62d77375f525c653c1 100644 (file)
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -670,11 +670,8 @@ static void acpi_hibernation_leave(void)
        /* Reprogram control registers */
        acpi_leave_sleep_state_prep(ACPI_STATE_S4);
        /* Check the hardware signature */
-       if (facs && s4_hardware_signature != facs->hardware_signature) {
-               printk(KERN_EMERG "ACPI: Hardware changed while hibernated, "
-                       "cannot resume!\n");
-               panic("ACPI S4 hardware signature mismatch");
-       }
+       if (facs && s4_hardware_signature != facs->hardware_signature)
+               pr_crit("ACPI: Hardware changed while hibernated, success doubtful!\n");
        /* Restore the NVS memory area */
        suspend_nvs_restore();
        /* Allow EC transactions to happen. */