[ACPI] acpi_pci_link_allocate() should stick with irq.active if set. (Andrew de Quincey)

Fixes OSDL #1186 "broken USB" and others

[ACPI] acpi_pci_link_allocate() should stick with irq.active if set. (Andrew de Quincey)
Fixes OSDL #1186 "broken USB" and others
b5e48980 · Len Brown · Len Brown · 1c43dc3a · b5e48980
Commit b5e48980 authored Sep 29, 2003 by Len Brown Committed by Len Brown Sep 29, 2003
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

drivers/acpi/pci_link.c drivers/acpi/pci_link.c +8 -8

No files found.
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -500,7 +500,6 @@ static int acpi_pci_link_allocate(struct acpi_pci_link* link) {
 		irq = link->irq.active;
 	} else {
 		irq = link->irq.possible[0];
-	}

 		/*
 		 * Select the best IRQ.  This is done in reverse to promote
@@ -510,6 +509,7 @@ static int acpi_pci_link_allocate(struct acpi_pci_link* link) {
 			if (acpi_irq_penalty[irq] > acpi_irq_penalty[link->irq.possible[i]])
 				irq = link->irq.possible[i];
 		}
+	}

 	/* Attempt to enable the link device at this IRQ. */
 	if (acpi_pci_link_set(link, irq)) {