Commit 5ec5d106 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Revert "ACPI / PCI: Simplify acpi_penalize_isa_irq()"

Revert commit 09716869 "ACPI / PCI: Simplify acpi_penalize_isa_irq()"
that depends on commit b5bd0269 (ACPI, PCI, irq: remove interrupt
count restriction) which introduced a regression and needs to be
reverted for this reason.
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 81f70ba2
...@@ -877,9 +877,17 @@ static int __init acpi_irq_penalty_update(char *str, int used) ...@@ -877,9 +877,17 @@ static int __init acpi_irq_penalty_update(char *str, int used)
*/ */
void acpi_penalize_isa_irq(int irq, int active) void acpi_penalize_isa_irq(int irq, int active)
{ {
if (irq >= 0) int penalty;
acpi_irq_add_penalty(irq, active ?
PIRQ_PENALTY_ISA_USED : PIRQ_PENALTY_PCI_USING); if (irq < 0)
return;
if (active)
penalty = PIRQ_PENALTY_ISA_USED;
else
penalty = PIRQ_PENALTY_PCI_USING;
acpi_irq_add_penalty(irq, penalty);
} }
bool acpi_isa_irq_available(int irq) bool acpi_isa_irq_available(int irq)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment