summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorBogdan Radulescu <bogdan@nimblex.net>2011-10-06 20:35:12 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2011-10-16 23:30:36 +0200
commit731b25a4ad3c27b44f3447382da18b59167eb7a1 (patch)
treea34fc45d723e6bc0618b5b0257073ee793de22ef /drivers/acpi
parent89e8ea1278fb3b237159a1ca193002ef5c8652d8 (diff)
downloadlinux-3.10-731b25a4ad3c27b44f3447382da18b59167eb7a1.tar.gz
linux-3.10-731b25a4ad3c27b44f3447382da18b59167eb7a1.tar.bz2
linux-3.10-731b25a4ad3c27b44f3447382da18b59167eb7a1.zip
PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvs
Sony Vaio VGN-FW520F does not resume correctly without acpi_sleep=nonvs, so add it to the ACPI sleep blacklist. References: https://bugzilla.kernel.org/show_bug.cgi?id=16396#c86 Signed-off-by: Bogdan Radulescu <bogdan@nimblex.net> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/sleep.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 8c3e514a343..28a3e96a902 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -452,6 +452,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR26GN_P"),
},
},
+ {
+ .callback = init_nvs_nosave,
+ .ident = "Sony Vaio VGN-FW520F",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW520F"),
+ },
+ },
{},
};
#endif /* CONFIG_SUSPEND */