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
Unified · Split
| @@ -839,7 +839,7 @@ void acpi_penalize_isa_irq(int irq, int active) · 838 unmodified lines | |||
| 839 | { | 839 | { |
| 840 | if ((irq >= 0) && (irq < ARRAY_SIZE(acpi_isa_irq_penalty))) | 840 | if ((irq >= 0) && (irq < ARRAY_SIZE(acpi_isa_irq_penalty))) |
| 841 | acpi_isa_irq_penalty[irq] = acpi_irq_get_penalty(irq) + | 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 | bool acpi_isa_irq_available(int irq) | 845 | bool acpi_isa_irq_available(int irq) |