]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
ACPI / PM: Do not save/restore NVS on Asus K54C/K54HR
authorKeng-Yu Lin <kengyu@canonical.com>
Thu, 1 Dec 2011 23:04:23 +0000 (00:04 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Tue, 6 Dec 2011 21:08:23 +0000 (22:08 +0100)
The models do not resume correctly without acpi_sleep=nonvs.

Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
drivers/acpi/sleep.c

index 6d9a3ab58db2608c3101cea8cf7ccefa54439d66..0a7ed69546ba47db0c322542864c168068baa7f4 100644 (file)
@@ -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 */