diff options
author | Keng-Yu Lin <kengyu@canonical.com> | 2011-12-01 18:04:23 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-12-06 16:08:23 -0500 |
commit | 5a50a7c32d630d6cdb13d69afabb0cc81b2f379c (patch) | |
tree | 716c5d080b4d95845f22c66ed5605ee51d1387f7 | |
parent | 48580ab8729865c81e148d59159fbe2aa7865511 (diff) |
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>
-rw-r--r-- | 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 6d9a3ab58db2..0a7ed69546ba 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
@@ -476,6 +476,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { | |||
476 | DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW520F"), | 476 | DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW520F"), |
477 | }, | 477 | }, |
478 | }, | 478 | }, |
479 | { | ||
480 | .callback = init_nvs_nosave, | ||
481 | .ident = "Asus K54C", | ||
482 | .matches = { | ||
483 | DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), | ||
484 | DMI_MATCH(DMI_PRODUCT_NAME, "K54C"), | ||
485 | }, | ||
486 | }, | ||
487 | { | ||
488 | .callback = init_nvs_nosave, | ||
489 | .ident = "Asus K54HR", | ||
490 | .matches = { | ||
491 | DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), | ||
492 | DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"), | ||
493 | }, | ||
494 | }, | ||
479 | {}, | 495 | {}, |
480 | }; | 496 | }; |
481 | #endif /* CONFIG_SUSPEND */ | 497 | #endif /* CONFIG_SUSPEND */ |