diff options
author | David Shaohua Li <shaohua.li@intel.com> | 2005-08-03 11:00:11 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-03 11:04:10 -0400 |
commit | ecc21ebe603af31f172c43b8b261df79040790ef (patch) | |
tree | d2468578cb327adbd3d69feb610a79b8b8a0f84d | |
parent | 3d35600a9de8e2816d0e3726f64b7271af6fdda4 (diff) |
[ACPI] PCI interrupt link suspend/resume - revert to 2.6.12 behaviour
This patch disables the PCI Interrupt Link refernece counts,
which should not co-exist with the 2.6.12 irq_router.resume
method or else a double acpi_pci_link_set() could result
on resume.
Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/acpi/pci_link.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 6a29610edc11..0091dbdf7ef9 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c | |||
@@ -692,7 +692,18 @@ acpi_pci_link_free_irq(acpi_handle handle) | |||
692 | return_VALUE(-1); | 692 | return_VALUE(-1); |
693 | } | 693 | } |
694 | 694 | ||
695 | #ifdef FUTURE_USE | ||
696 | /* | ||
697 | * The Link reference count allows us to _DISable an unused link | ||
698 | * and suspend time, and set it again on resume. | ||
699 | * However, 2.6.12 still has irq_router.resume | ||
700 | * which blindly restores the link state. | ||
701 | * So we disable the reference count method | ||
702 | * to prevent duplicate acpi_pci_link_set() | ||
703 | * which would harm some systems | ||
704 | */ | ||
695 | link->refcnt --; | 705 | link->refcnt --; |
706 | #endif | ||
696 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 707 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
697 | "Link %s is dereferenced\n", acpi_device_bid(link->device))); | 708 | "Link %s is dereferenced\n", acpi_device_bid(link->device))); |
698 | 709 | ||