Commit dbdc3bb7 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'acpi-4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "Fix an expression in the ACPI PCI IRQ management code added by a
  recent commit that overlooked missing parens in it, so the result of
  the computation is incorrect in some cases (Sinan Kaya)"

* tag 'acpi-4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI,PCI,IRQ: correct operator precedence
parents 81dbd6f5 54794580
...@@ -839,7 +839,7 @@ void acpi_penalize_isa_irq(int irq, int active) ...@@ -839,7 +839,7 @@ void acpi_penalize_isa_irq(int irq, int active)
{ {
if ((irq >= 0) && (irq < ARRAY_SIZE(acpi_isa_irq_penalty))) if ((irq >= 0) && (irq < ARRAY_SIZE(acpi_isa_irq_penalty)))
acpi_isa_irq_penalty[irq] = acpi_irq_get_penalty(irq) + acpi_isa_irq_penalty[irq] = acpi_irq_get_penalty(irq) +
active ? PIRQ_PENALTY_ISA_USED : PIRQ_PENALTY_PCI_USING; (active ? PIRQ_PENALTY_ISA_USED : PIRQ_PENALTY_PCI_USING);
} }
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