diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-01 18:31:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-01 18:31:48 -0400 |
| commit | dbdc3bb74faeec5fd92e28c15c945045d5aab426 (patch) | |
| tree | a56fcb4cd26b6a10ddd4e39c58a6e281227048d7 | |
| parent | 81dbd6f59d91afdba16ec2edb58f6f048feed838 (diff) | |
| parent | 54794580f5949253520265e46c903878ab222d84 (diff) | |
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
| -rw-r--r-- | drivers/acpi/pci_link.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 8fc7323ed3e8..4ed4061813e6 100644 --- 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) | |||
| 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) |