summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorKeng-Yu Lin <kengyu@canonical.com>2011-12-02 00:04:23 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2011-12-06 22:08:23 +0100
commit5a50a7c32d630d6cdb13d69afabb0cc81b2f379c (patch)
tree716c5d080b4d95845f22c66ed5605ee51d1387f7 /drivers/acpi
parent48580ab8729865c81e148d59159fbe2aa7865511 (diff)
downloadop-kernel-dev-5a50a7c32d630d6cdb13d69afabb0cc81b2f379c.zip
op-kernel-dev-5a50a7c32d630d6cdb13d69afabb0cc81b2f379c.tar.gz
ACPI / PM: Do not save/restore NVS on Asus K54C/K54HR
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>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/sleep.c16
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 */
OpenPOWER on IntegriCloud