On Friday, January 10, 2014 10:51:53 AM oliver@xxxxxxxxxx wrote:
> From: Oliver Neukum <oneukum@xxxxxxx>
>
> 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@xxxxxxx>
Queued up for 3.14, thanks!
> ---
> drivers/acpi/sleep.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
> index 9c1a435..14744e5 100644
> --- a/drivers/acpi/sleep.c
> +++ b/drivers/acpi/sleep.c
> @@ -664,11 +664,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. */
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
