Skip to content

Commit

Permalink
Merge branch 'acpi-pci'
Browse files Browse the repository at this point in the history
* acpi-pci:
  ACPI/PCI: pci_link: use extended_irq union member when setting ext-irq shareable
  • Loading branch information
Rafael J. Wysocki committed Apr 24, 2020
2 parents 2b6022a + 1c5e1cd commit 0db0d14
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/acpi/pci_link.c
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
resource->res.data.extended_irq.polarity =
link->irq.polarity;
if (link->irq.triggering == ACPI_EDGE_SENSITIVE)
resource->res.data.irq.shareable =
resource->res.data.extended_irq.shareable =
ACPI_EXCLUSIVE;
else
resource->res.data.irq.shareable = ACPI_SHARED;
resource->res.data.extended_irq.shareable = ACPI_SHARED;
resource->res.data.extended_irq.interrupt_count = 1;
resource->res.data.extended_irq.interrupts[0] = irq;
/* ignore resource_source, it's optional */
Expand Down

0 comments on commit 0db0d14

Please sign in to comment.