summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.de>2014-01-10 10:51:53 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-11 01:39:10 +0100
commit5c551e624abba6782034edd5b9eb58ac6f146b38 (patch)
treed3cf5287d3b54705c631000a340c430586a891c0 /drivers/acpi
parentLinux 3.13-rc7 (diff)
downloadlinux-5c551e624abba6782034edd5b9eb58ac6f146b38.tar.xz
linux-5c551e624abba6782034edd5b9eb58ac6f146b38.zip
ACPI / sleep: remove panic in case hardware has changed after S4
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 <oneukum@suse.de> [rjw: Use pr_crit() for the message and don't break the string] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/sleep.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 721e949e606e..32f7dee2f16b 100644
--- 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. */