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

torvalds · torvalds · commit dbdc3bb74fae · 2016-07-01T15:31:48.000-07:00
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
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -839,7 +839,7 @@ void acpi_penalize_isa_irq(int irq, int active)`
`839`	`839`	`{`
`840`	`840`	`if ((irq >= 0) && (irq < ARRAY_SIZE(acpi_isa_irq_penalty)))`
`841`	`841`	`acpi_isa_irq_penalty[irq] = acpi_irq_get_penalty(irq) +`
`842`		`- active ? PIRQ_PENALTY_ISA_USED : PIRQ_PENALTY_PCI_USING;`
	`842`	`+ (active ? PIRQ_PENALTY_ISA_USED : PIRQ_PENALTY_PCI_USING);`
`843`	`843`	`}`
`844`	`844`
`845`	`845`	`bool acpi_isa_irq_available(int irq)`