Commit 0db0d142 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-pci' 

* acpi-pci:
  ACPI/PCI: pci_link: use extended_irq union member when setting ext-irq shareable
parents 2b6022a3 1c5e1cdd

drivers/acpi/pci_link.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */