Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbdc3bb7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

drivers/acpi/pci_link.c

+1 −1
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ void acpi_penalize_isa_irq(int irq, int active) 
{

	if ((irq >= 0) && (irq < ARRAY_SIZE(acpi_isa_irq_penalty)))

		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)