diff options
| author | Keng-Yu Lin <kengyu@canonical.com> | 2011-12-02 00:04:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-12 10:32:57 -0700 |
| commit | 3ff2d5a6e8e1f7c793e2354a7917fd20206c4983 (patch) | |
| tree | 2c0fdd8a5d06036946bfa1bb6f185f1ecb0acf82 /drivers/acpi | |
| parent | b38d6b8e1914ed83cc58673341781f4cba4d9d06 (diff) | |
| download | linux-stable-3ff2d5a6e8e1f7c793e2354a7917fd20206c4983.tar.gz linux-stable-3ff2d5a6e8e1f7c793e2354a7917fd20206c4983.tar.bz2 linux-stable-3ff2d5a6e8e1f7c793e2354a7917fd20206c4983.zip | |
ACPI / PM: Do not save/restore NVS on Asus K54C/K54HR
commit 5a50a7c32d630d6cdb13d69afabb0cc81b2f379c upstream.
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>
Cc: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/acpi')
| -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 6c949602cbd1..0bd4832fb1a8 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -428,6 +428,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "1000 Series"), }, }, + { + .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 */ |