diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-06-04 20:59:11 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-06-04 20:59:11 +0300 |
| commit | 9f91d05e4aaceb46d9f39da9fa3c9c64643b9154 (patch) | |
| tree | a6b3c64a484b87641550d840a7038bc682d5d8fb /drivers/acpi | |
| parent | 08d6c8fca74c502bbb82c265bdd34096f4beb7bb (diff) | |
| parent | 3910ebaca8eae0cb9d41a20efe1bcb375ec64dfb (diff) | |
| download | linux-9f91d05e4aaceb46d9f39da9fa3c9c64643b9154.tar.xz | |
Merge branch 'pci/misc'
- Clarify that platform_get_irq() should never return 0 (Bjorn Helgaas)
- Check for platform_get_irq() failure consistently (Bjorn Helgaas)
- Replace zero-length array with flexible-array (Gustavo A. R. Silva)
- Unify pcie_find_root_port() and pci_find_pcie_root_port() (Yicong Yang)
- Quirk Intel C620 MROMs, which have non-BARs in BAR locations (Xiaochun
Lee)
- Fix pcie_pme_resume() and pcie_pme_remove() kernel-doc (Jay Fang)
- Rename _DSM constants to align with spec (Krzysztof Wilczyński)
* pci/misc:
PCI: Rename _DSM constants to align with spec
PCI/PME: Fix kernel-doc of pcie_pme_resume() and pcie_pme_remove()
x86/PCI: Mark Intel C620 MROMs as having non-compliant BARs
PCI: Unify pcie_find_root_port() and pci_find_pcie_root_port()
PCI: Replace zero-length array with flexible-array
PCI: Check for platform_get_irq() failure consistently
driver core: platform: Clarify that IRQ 0 is invalid
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/pci_root.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 9e235c1a75ff..f90e841c59f5 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -933,7 +933,7 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root, * assignments made by firmware for this host bridge. */ obj = acpi_evaluate_dsm(ACPI_HANDLE(bus->bridge), &pci_acpi_dsm_guid, 1, - IGNORE_PCI_BOOT_CONFIG_DSM, NULL); + DSM_PCI_PRESERVE_BOOT_CONFIG, NULL); if (obj && obj->type == ACPI_TYPE_INTEGER && obj->integer.value == 0) host_bridge->preserve_config = 1; ACPI_FREE(obj); |