summaryrefslogtreecommitdiff
path: root/drivers/acpi/sleep.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-10-17 21:01:21 +0200
committerLen Brown <len.brown@intel.com>2010-10-25 20:12:12 -0400
commitaf48931c4863ced64cc52c58757be6e254437f9a (patch)
treee42629d0ab9628397f6bca5a30ee6971f4527d74 /drivers/acpi/sleep.c
parentd38a5edf812c2f715242aa20b6beb785939a0096 (diff)
downloadlinux-3.10-af48931c4863ced64cc52c58757be6e254437f9a.tar.gz
linux-3.10-af48931c4863ced64cc52c58757be6e254437f9a.tar.bz2
linux-3.10-af48931c4863ced64cc52c58757be6e254437f9a.zip
ACPI / PM: Blacklist another machine that needs acpi_sleep=nonvs
Sony Vaio VPCEB1Z1E is reported to require acpi_sleep=nonvs for suspend/resume to work on it correctly, so blacklist it. Reported-by: Emanuele Bigiarini <pulmro@gmail.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/sleep.c')
-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 b9af2c2ff92..05dc42c2a46 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -419,6 +419,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "Everex StepNote Series"),
},
},
+ {
+ .callback = init_nvs_nosave,
+ .ident = "Sony Vaio VPCEB1Z1E",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1Z1E"),
+ },
+ },
{},
};
#endif /* CONFIG_SUSPEND */