1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index a2297db80813..07aa722bb12c 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -255,6 +255,13 @@ static int pciehp_probe(struct pcie_device *dev)
         else if (pciehp_acpi_slot_detection_check(dev->port))
                 goto err_out_none;
 
+        if (!dev->port->subordinate) {
+                /* Can happen if we run out of bus numbers during probe */
+                dev_err(&dev->device,
+                        "Hotplug bridge without secondary bus, ignoring\n");
+                goto err_out_none;
+        }
+
         ctrl = pcie_init(dev);
         if (!ctrl) {
                 dev_err(&dev->device, "Controller initialization failed\n");