diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-04-24 21:03:57 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-04-24 21:03:57 +0200 |
| commit | 0db0d142e2d2c7522764511f45c0d3c15dbd8be0 (patch) | |
| tree | 9fc20100cc699243a4706f361cc1f65c9da5fe2d /drivers/acpi | |
| parent | 2b6022a32e1c6e740a5929951d9d8cbed3b162b1 (diff) | |
| parent | 1c5e1cdd7c1f34e6d7f22f9b819a307e435e780e (diff) | |
| download | linux-0db0d142e2d2c7522764511f45c0d3c15dbd8be0.tar.gz linux-0db0d142e2d2c7522764511f45c0d3c15dbd8be0.tar.bz2 linux-0db0d142e2d2c7522764511f45c0d3c15dbd8be0.zip | |
Merge branch 'acpi-pci'
* acpi-pci:
ACPI/PCI: pci_link: use extended_irq union member when setting ext-irq shareable
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/pci_link.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 00a6da2121be..ed3d2182cf2c 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -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 */ |