From patchwork Mon Jan 7 20:34:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [3.5.y.z, extended, stable] Patch "ACPI / PM: Add Sony Vaio VPCEB1S1E to nonvs blacklist." has been added to staging queue Date: Mon, 07 Jan 2013 10:34:28 -0000 From: Herton Ronaldo Krzesinski X-Patchwork-Id: 210154 Message-Id: <1357590868-18739-1-git-send-email-herton.krzesinski@canonical.com> To: Lan Tianyu Cc: kernel-team@lists.ubuntu.com, "Rafael J. Wysocki" , =?UTF-8?q?S=C3=A9bastien=20Wilmet?= This is a note to let you know that I have just added a patch titled ACPI / PM: Add Sony Vaio VPCEB1S1E to nonvs blacklist. to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Herton ------ >From 2648a68934d966bd8f5eadde6a3c4ce90b0e706c Mon Sep 17 00:00:00 2001 From: Lan Tianyu Date: Wed, 21 Nov 2012 23:12:12 +0100 Subject: [PATCH] ACPI / PM: Add Sony Vaio VPCEB1S1E to nonvs blacklist. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 876ab79055019e248508cfd0dee7caa3c0c831ed upstream. 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 Signed-off-by: Lan Tianyu Signed-off-by: Rafael J. Wysocki Signed-off-by: Herton Ronaldo Krzesinski --- drivers/acpi/sleep.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 1.7.9.5 diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 8856102..69fd953 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -547,6 +547,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"),