4 files changed, 9 insertions, 6 deletions

diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index f2271173bbd5..6ad0e77df9b3 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -804,9 +804,12 @@ static int __init acpi_irq_penalty_update(char *str, int used)
  * There is no ISA_POSSIBLE weight, so we simply use
  * the (small) PCI_USING penalty.
  */
-void acpi_penalize_isa_irq(int irq)
+void acpi_penalize_isa_irq(int irq, int active)
 {
-        acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;
+        if (active)
+                acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED;
+        else
+                acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;
 }
 
 /*
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index ae3819ad7cf4..75575f6c349c 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -160,7 +160,7 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                                 acpi_register_gsi(res->data.irq.interrupts[0],
                                         res->data.irq.edge_level,
                                         res->data.irq.active_high_low));
-                        pcibios_penalize_isa_irq(res->data.irq.interrupts[0]);
+                        pcibios_penalize_isa_irq(res->data.irq.interrupts[0], 1);
                 }
                 break;
 
@@ -171,7 +171,7 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                                 acpi_register_gsi(res->data.extended_irq.interrupts[0],
                                         res->data.extended_irq.edge_level,
                                         res->data.extended_irq.active_high_low));
-                        pcibios_penalize_isa_irq(res->data.extended_irq.interrupts[0]);
+                        pcibios_penalize_isa_irq(res->data.extended_irq.interrupts[0], 1);
                 }
                 break;
         case ACPI_RSTYPE_DMA:
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index 79bce7b75740..9001b6f0204d 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -64,7 +64,7 @@ pnpbios_parse_allocated_irqresource(struct pnp_resource_table * res, int irq)
                 }
                 res->irq_resource[i].start =
                 res->irq_resource[i].end = (unsigned long) irq;
-                pcibios_penalize_isa_irq(irq);
+                pcibios_penalize_isa_irq(irq, 1);
         }
 }
 
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 2d1322dd7e19..887ad8939349 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -102,7 +102,7 @@ int pnp_register_irq_resource(struct pnp_option *option, struct pnp_irq *data)
 
                 for (i = 0; i < 16; i++)
                         if (test_bit(i, data->map))
-                                pcibios_penalize_isa_irq(i);
+                                pcibios_penalize_isa_irq(i, 0);
         }
 #endif
         return 0;