From: Kamal Mostafa Date: Mon, 20 Oct 2014 19:08:10 +0000 (-0700) Subject: Revert duplicate "PCI: pciehp: Prevent NULL dereference during probe" X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c302d35eac32bbd99ed9e3dc5b03d58073c78e86;p=linux-beck.git Revert duplicate "PCI: pciehp: Prevent NULL dereference during probe" This reverts bceee4a97eb5 ("PCI: pciehp: Prevent NULL dereference during probe") because it was accidentally applied twice: 62e4492c3063 ("PCI: Prevent NULL dereference during pciehp probe") bceee4a97eb5 ("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 --- diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 3a5e7e28b874..07aa722bb12c 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");