From: Lan Tianyu Date: Sat, 21 Jan 2012 01:23:56 +0000 (+0800) Subject: ACPI / PM: Add Sony Vaio VPCCW29FX to nonvs blacklist. X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=83b8b916e8155afb4c48ae323cc54acbfccc71c3;p=android-x86%2Fkernel.git ACPI / PM: Add Sony Vaio VPCCW29FX to nonvs blacklist. commit 93f770846e8dedc5d9117bd4ad9d7efd18420627 upstream. 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 Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 0bd4832fb1a8..79ddcdee83ad 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -422,6 +422,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"),