[ACPI] fix IRQ assignment regression with CONFIG_PNPACPI=y

http://bugzilla.kernel.org/show_bug.cgi?id=3762

Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 796b2c157166861eea31f0c01d6706e65604921c..bc724160ba1fefc771974ff02db3b60a75046ff5 100644 (file)
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -791,9 +791,16 @@ static int __init acpi_irq_penalty_update(char *str, int used)
        return 1;
 }
 
+/*
+ * We'd like PNP to call this routine for the
+ * single ISA_USED value for each legacy device.
+ * But instead it calls us with each POSSIBLE setting.
+ * There is no ISA_POSSIBLE weight, so we simply use
+ * the (small) PCI_USING penalty.
+ */
 void acpi_penalize_isa_irq(int irq)
 {
-       acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED;
+       acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;
 }
 
 /*