projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[powerpc.git]
/
drivers
/
acpi
/
pci_link.c
diff --git
a/drivers/acpi/pci_link.c
b/drivers/acpi/pci_link.c
index
07bc6df
..
8920e8c
100644
(file)
--- a/
drivers/acpi/pci_link.c
+++ b/
drivers/acpi/pci_link.c
@@
-812,6
+812,9
@@
static int irqrouter_resume(struct sys_device *dev)
ACPI_FUNCTION_TRACE("irqrouter_resume");
ACPI_FUNCTION_TRACE("irqrouter_resume");
+ /* Make sure SCI is enabled again (Apple firmware bug?) */
+ acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1, ACPI_MTX_DO_NOT_LOCK);
+
acpi_in_resume = 1;
list_for_each(node, &acpi_link.entries) {
link = list_entry(node, struct acpi_pci_link, node);
acpi_in_resume = 1;
list_for_each(node, &acpi_link.entries) {
link = list_entry(node, struct acpi_pci_link, node);