summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLan Tianyu <tianyu.lan@intel.com>2012-11-21 23:12:12 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-21 23:12:12 +0100
commit876ab79055019e248508cfd0dee7caa3c0c831ed (patch)
treed0cb6d7f71aa7437a4d545b0cacbf2712020f05a /drivers/acpi
parent4000e626156935dfb626321ce09cae2c833eabbb (diff)
downloadop-kernel-dev-876ab79055019e248508cfd0dee7caa3c0c831ed.zip
op-kernel-dev-876ab79055019e248508cfd0dee7caa3c0c831ed.tar.gz
ACPI / PM: Add Sony Vaio VPCEB1S1E to nonvs blacklist.
Sony Vaio VPCEB1S1E 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=48781 Reported-by: Sébastien Wilmet <swilmet@gnome.org> Cc: <stable@vger.kernel.org> Signed-off-by: Lan Tianyu <tianyu.lan@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
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 8640782..1463c56 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -534,6 +534,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
},
{
.callback = init_nvs_nosave,
+ .ident = "Sony Vaio VPCEB1S1E",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1S1E"),
+ },
+ },
+ {
+ .callback = init_nvs_nosave,
.ident = "Sony Vaio VGN-FW520F",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
OpenPOWER on IntegriCloud