Skip to content

L
linux
Commit b5e48980 authored by Len Brown's avatar Len Brown Committed by Len Brown
Browse files
Options

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

Fixes OSDL #1186 "broken USB" and others
parent 1c43dc3a
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
drivers/acpi/pci_link.c
View file @ b5e48980
...@@ -500,7 +500,6 @@ static int acpi_pci_link_allocate(struct acpi_pci_link* link) { ...@@ -500,7 +500,6 @@ static int acpi_pci_link_allocate(struct acpi_pci_link* link) {
irq = link->irq.active; irq = link->irq.active;
} else { } else {
irq = link->irq.possible[0]; irq = link->irq.possible[0];
}
/* /*
* Select the best IRQ. This is done in reverse to promote * 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) { ...@@ -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]]) if (acpi_irq_penalty[irq] > acpi_irq_penalty[link->irq.possible[i]])
irq = link->irq.possible[i]; irq = link->irq.possible[i];
} }
}
/* Attempt to enable the link device at this IRQ. */ /* Attempt to enable the link device at this IRQ. */
if (acpi_pci_link_set(link, irq)) { if (acpi_pci_link_set(link, irq)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7