From 4767d71c7bf874c07b50edd2e4e8e8d34a0c04ad Mon Sep 17 00:00:00 2001 From: Kamal Mostafa Date: Mon, 20 Oct 2014 12:08:10 -0700 Subject: [PATCH] Revert duplicate "PCI: pciehp: Prevent NULL dereference during probe" This reverts 5c9fea640354 ("PCI: pciehp: Prevent NULL dereference during probe") because it was accidentally applied twice: d0c11074b4c9 ("PCI: Prevent NULL dereference during pciehp probe") 5c9fea640354 ("PCI: pciehp: Prevent NULL dereference during probe") Revert the latter to dispose of the duplicated code block. [bhelgaas: tidy changelog, drop stable tag] Signed-off-by: Kamal Mostafa Signed-off-by: Bjorn Helgaas CC: Andreas Noever --- drivers/pci/hotplug/pciehp_core.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 3a5e7e28b8740..07aa722bb12cd 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c @@ -262,13 +262,6 @@ static int pciehp_probe(struct pcie_device *dev) 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"); -- 2.39.5