From: Oliver Neukum Date: Fri, 10 Jan 2014 09:51:53 +0000 (+0100) Subject: ACPI / sleep: remove panic in case hardware has changed after S4 X-Git-Tag: v3.12.19~26 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43c5512d313281d04a91531aa205fac9aa2995a2;p=thirdparty%2Fkernel%2Fstable.git ACPI / sleep: remove panic in case hardware has changed after S4 commit 5c551e624abba6782034edd5b9eb58ac6f146b38 upstream. Some BIOSes change hardware based on the state of a laptop's lid. If the lid is closed, the touchpad is disabled and the checksum changes. Windows 8 no longer aborts resume if the checksum has changed. Signed-off-by: Oliver Neukum [rjw: Use pr_crit() for the message and don't break the string] Signed-off-by: Rafael J. Wysocki Signed-off-by: Jiri Slaby --- diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 99e5158456d86..c09e6f646fe4f 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -675,11 +675,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. */