Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9a6bb46 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/acpi' into next 

* pci/acpi:
  ACPI / PCI: Bail early in acpi_pci_add_bus() if there is no ACPI handle
parents 9e66317d a0040c01

drivers/pci/pci-acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -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);