diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-11-14 12:11:19 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-11-14 12:11:19 -0600 |
| commit | a9a6bb463353d6d2bc5620ade0fa3efb4ec5efae (patch) | |
| tree | e43ef18b2adb970ac9bb879297f7b080e7c452b5 | |
| parent | 9e66317d3c92ddaab330c125dfe9d06eee268aff (diff) | |
| parent | a0040c0145945d3bd203df8fa97f6dfa819f3f7d (diff) | |
Merge branch 'pci/acpi' into next
* pci/acpi:
ACPI / PCI: Bail early in acpi_pci_add_bus() if there is no ACPI handle
| -rw-r--r-- | drivers/pci/pci-acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index a8da543b3814..4708eb9df71b 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -624,7 +624,7 @@ void acpi_pci_add_bus(struct pci_bus *bus) union acpi_object *obj; struct pci_host_bridge *bridge; - if (acpi_pci_disabled || !bus->bridge) + if (acpi_pci_disabled || !bus->bridge || !ACPI_HANDLE(bus->bridge)) return; acpi_pci_slot_enumerate(bus); |