git: e3589b77d084 - releng/15.2 - acpi_pci_link: Factor out some duplicated code into a single copy
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 19 Nov 2026 16:05:03 UTC
The branch releng/15.2 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=e3589b77d084cf356bbe39fbc932e322ff840bed
commit e3589b77d084cf356bbe39fbc932e322ff840bed
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2026-11-14 16:02:38 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-11-19 16:04:44 +0000
acpi_pci_link: Factor out some duplicated code into a single copy
Approved by: re (cperciva)
Tested by: cperciva
(cherry picked from commit 6c1b6f7cf81447315fc0c7a294ed1467c62832bd)
(cherry picked from commit b898d97abd96a31c1e26fb15779d35daf7b6ac97)
---
sys/dev/acpica/acpi_pci_link.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c
index 378e4631e97d..b10f9614c5bc 100644
--- a/sys/dev/acpica/acpi_pci_link.c
+++ b/sys/dev/acpica/acpi_pci_link.c
@@ -356,13 +356,12 @@ link_add_prs(ACPI_RESOURCE *res, void *context)
for (i = 0; i < link->l_num_irqs; i++) {
if (ext_irqs != NULL) {
link->l_irqs[i] = ext_irqs[i];
- if (ext_irqs[i] >= NUM_ISA_INTERRUPTS)
- link->l_isa_irq = false;
} else {
link->l_irqs[i] = irqs[i];
- if (irqs[i] >= NUM_ISA_INTERRUPTS)
- link->l_isa_irq = false;
}
+
+ if (link->l_irqs[i] >= NUM_ISA_INTERRUPTS)
+ link->l_isa_irq = false;
}
/*