Gitweb:     http://git.kernel.org/linus/ea5bc73f4f56449b2d450068d492bcd17a675d7a
Commit:     ea5bc73f4f56449b2d450068d492bcd17a675d7a
Parent:     07bedca29b0973f36a6b6db36936deed367164ed
Author:     Kamal Mostafa <kamal@canonical.com>
AuthorDate: Tue Apr 27 14:02:40 2010 -0700
Committer:  Len Brown <len.brown@intel.com>
CommitDate: Thu May 6 13:22:45 2010 -0400

    ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155x
    
    Add Dell Studio models (1558, 1557, 1555) to the 'set_sci_en_on_resume'
    list to fix hang on resume.
    
    BugLink: http://bugs.launchpad.net/bugs/553498
    
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    Acked-by: Alex Chiang <achiang@canonical.com>
    Cc: stable@kernel.org
    Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/acpi/sleep.c |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 0fc91a9..e2e9925 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -578,6 +578,30 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
 		DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),
 		},
 	},
+	{
+	.callback = init_set_sci_en_on_resume,
+	.ident = "Dell Studio 1558",
+	.matches = {
+		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+		DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1558"),
+		},
+	},
+	{
+	.callback = init_set_sci_en_on_resume,
+	.ident = "Dell Studio 1557",
+	.matches = {
+		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+		DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1557"),
+		},
+	},
+	{
+	.callback = init_set_sci_en_on_resume,
+	.ident = "Dell Studio 1555",
+	.matches = {
+		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+		DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1555"),
+		},
+	},
 	{},
 };
 #endif /* CONFIG_SUSPEND */
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html