From: Bogdan Radulescu <bogdan@nimblex.net>
Date: Thu, 6 Oct 2011 18:35:12 +0000 (+0200)
Subject: PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvs
X-Git-Tag: next-20111007~31^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2115c4d85385afdc70ce0227bfbd0397b025a326;p=karo-tx-linux.git

PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvs

Sony Vaio VGN-FW520F 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=16396#c86
Signed-off-by: Bogdan Radulescu <bogdan@nimblex.net>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 8c3e514a343f..28a3e96a902d 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -452,6 +452,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
 		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR26GN_P"),
 		},
 	},
+	{
+	.callback = init_nvs_nosave,
+	.ident = "Sony Vaio VGN-FW520F",
+	.matches = {
+		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW520F"),
+		},
+	},
 	{},
 };
 #endif /* CONFIG_SUSPEND */