summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/sleep.c
diff options
context:
space:
mode:
authorLan Tianyu2012-01-21 02:23:56 +0100
committerLen Brown2012-01-21 07:29:50 +0100
commit93f770846e8dedc5d9117bd4ad9d7efd18420627 (patch)
tree26cafaec2a5ddd122a122c6f56cb068931e8cf25 /drivers/acpi/sleep.c
parentLinux 3.3-rc1 (diff)
downloadkernel-qcow2-linux-93f770846e8dedc5d9117bd4ad9d7efd18420627.tar.gz
kernel-qcow2-linux-93f770846e8dedc5d9117bd4ad9d7efd18420627.tar.xz
kernel-qcow2-linux-93f770846e8dedc5d9117bd4ad9d7efd18420627.zip
ACPI / PM: Add Sony Vaio VPCCW29FX to nonvs blacklist.
Sony Vaio VPCCW29FX does not resume correctly without acpi_sleep=nonvs, so add it to the ACPI sleep blacklist. https://bugzilla.kernel.org/show_bug.cgi?id=34722 Signed-off-by: Lan Tianyu <tianyu.lan@intel.com> 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 0a7ed69546ba..ca191ff97844 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -438,6 +438,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
},
{
.callback = init_nvs_nosave,
+ .ident = "Sony Vaio VPCCW29FX",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "VPCCW29FX"),
+ },
+ },
+ {
+ .callback = init_nvs_nosave,
.ident = "Averatec AV1020-ED2",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "AVERATEC"),