diff options
author | Kamal Mostafa <kamal@canonical.com> | 2010-04-27 17:02:40 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-05-06 13:22:45 -0400 |
commit | ea5bc73f4f56449b2d450068d492bcd17a675d7a (patch) | |
tree | 335fef4a026e1d6217f83e546412dee4a5f06c03 /drivers/acpi | |
parent | 07bedca29b0973f36a6b6db36936deed367164ed (diff) |
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>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | 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 0fc91a945ab4..e2e992599e68 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
@@ -578,6 +578,30 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { | |||
578 | DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"), | 578 | DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"), |
579 | }, | 579 | }, |
580 | }, | 580 | }, |
581 | { | ||
582 | .callback = init_set_sci_en_on_resume, | ||
583 | .ident = "Dell Studio 1558", | ||
584 | .matches = { | ||
585 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
586 | DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1558"), | ||
587 | }, | ||
588 | }, | ||
589 | { | ||
590 | .callback = init_set_sci_en_on_resume, | ||
591 | .ident = "Dell Studio 1557", | ||
592 | .matches = { | ||
593 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
594 | DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1557"), | ||
595 | }, | ||
596 | }, | ||
597 | { | ||
598 | .callback = init_set_sci_en_on_resume, | ||
599 | .ident = "Dell Studio 1555", | ||
600 | .matches = { | ||
601 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
602 | DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1555"), | ||
603 | }, | ||
604 | }, | ||
581 | {}, | 605 | {}, |
582 | }; | 606 | }; |
583 | #endif /* CONFIG_SUSPEND */ | 607 | #endif /* CONFIG_SUSPEND */ |