aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-19 21:05:09 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-19 21:05:09 -0400
commit5603509137940f4cbc577281cee62110d4097b1b (patch)
treedef89e77479baa644160ffa1467b1ead0ac88e2f /drivers/acpi
parent1cca0ebbb74298958dae1d1d3e7e9287c98a720c (diff)
Make sure to re-enable SCI after an ACPI suspend
According to the ACPI spec, it should be enabled on return from suspend, but bugs happen. Apparently especially on the Apple Intel Macs. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/pci_link.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 07bc6dfe662b..8920e8c6e246 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -812,6 +812,9 @@ static int irqrouter_resume(struct sys_device *dev)
812 812
813 ACPI_FUNCTION_TRACE("irqrouter_resume"); 813 ACPI_FUNCTION_TRACE("irqrouter_resume");
814 814
815 /* Make sure SCI is enabled again (Apple firmware bug?) */
816 acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1, ACPI_MTX_DO_NOT_LOCK);
817
815 acpi_in_resume = 1; 818 acpi_in_resume = 1;
816 list_for_each(node, &acpi_link.entries) { 819 list_for_each(node, &acpi_link.entries) {
817 link = list_entry(node, struct acpi_pci_link, node); 820 link = list_entry(node, struct acpi_pci_link, node);