ACPI: remove panic in case hardware signature has changed after S4

Some BIOSes change hardware signatures based on the state of a
laptop's lid.  When the lid is closed, the touchpad is disabled and
the checksum changes.

Windows 8 no longer aborts resume if the checksum has changed, so we
need to follow it in that respect, because many new machines are only
tested with Windows 8.

[rjw: Changelog]
Signed-off-by: Oliver Neukum <oneukum@suse.de>
No-objections-from: Thomas Renninger <trenn@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 187ab61889e6da5fab9312e987a620a4cb212280..43f5f16b1de2ff621a7748a265cfa3686af53252 100644 (file)
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -666,11 +666,9 @@ 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)
+               printk(KERN_CRIT "ACPI: Hardware changed while hibernated, "
+                       "success doubtful!\n");
        /* Restore the NVS memory area */
        suspend_nvs_restore();
        /* Allow EC transactions to happen. */