summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-02-24 13:53:46 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-02-24 13:53:46 +0100
commit5ec5d10682745d3280a37e8ffee1ddcd37ecfa94 (patch)
tree9abbf3def7784d05eabc8a64cf2a7c5513282e71 /drivers
parent81f70ba233d5f660e1ea5fe23260ee323af5d53a (diff)
downloadlinux-5ec5d10682745d3280a37e8ffee1ddcd37ecfa94.tar.bz2
Revert "ACPI / PCI: Simplify acpi_penalize_isa_irq()"
Revert commit 0971686954f9 "ACPI / PCI: Simplify acpi_penalize_isa_irq()" that depends on commit b5bd02695471 (ACPI, PCI, irq: remove interrupt count restriction) which introduced a regression and needs to be reverted for this reason. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/pci_link.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index fa2863567eed..5114d8007aa0 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -877,9 +877,17 @@ static int __init acpi_irq_penalty_update(char *str, int used)
*/
void acpi_penalize_isa_irq(int irq, int active)
{
- if (irq >= 0)
- acpi_irq_add_penalty(irq, active ?
- PIRQ_PENALTY_ISA_USED : PIRQ_PENALTY_PCI_USING);
+ int penalty;
+
+ 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)