From patchwork Wed Feb 29 06:52:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Precise/Oneric, SRU] ACPI / PM: Do not save/restore NVS on Asus K54C/K54HR Date: Tue, 28 Feb 2012 20:52:25 -0000 From: Keng-Yu Lin X-Patchwork-Id: 143671 Message-Id: <1330498345-22077-2-git-send-email-kengyu@canonical.com> To: kernel-team@lists.ubuntu.com The models do not resume correctly without acpi_sleep=nonvs. Signed-off-by: Keng-Yu Lin Signed-off-by: Rafael J. Wysocki (cherry picked from commit 5a50a7c32d630d6cdb13d69afabb0cc81b2f379c) BugLink: http://bugs.launchpad.net/bugs/898503 Signed-off-by: Keng-Yu Lin Acked-by: Stefan Bader Acked-by: Colin Ian King --- drivers/acpi/sleep.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 6d9a3ab..0a7ed69 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -476,6 +476,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW520F"), }, }, + { + .callback = init_nvs_nosave, + .ident = "Asus K54C", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "K54C"), + }, + }, + { + .callback = init_nvs_nosave, + .ident = "Asus K54HR", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"), + }, + }, {}, }; #endif /* CONFIG_SUSPEND */