|
@@ -670,11 +670,8 @@ static void acpi_hibernation_leave(void)
|
|
/* Reprogram control registers */
|
|
/* Reprogram control registers */
|
|
acpi_leave_sleep_state_prep(ACPI_STATE_S4);
|
|
acpi_leave_sleep_state_prep(ACPI_STATE_S4);
|
|
/* Check the hardware signature */
|
|
/* 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 */
|
|
/* Restore the NVS memory area */
|
|
suspend_nvs_restore();
|
|
suspend_nvs_restore();
|
|
/* Allow EC transactions to happen. */
|
|
/* Allow EC transactions to happen. */
|