This reverts commit bceee4a97eb58bd0e80e39eff11b506ddd9e7ad3.
This patch was applied twice (identical patch, different descriptions):
62e4492 PCI: Prevent NULL dereference during pciehp probe
bceee4a PCI: pciehp: Prevent NULL dereference during probe
Revert the latter to dispose of the duplicated code block.
Signed-off-by: Kamal Mostafa <[email protected]>
Cc: Andreas Noever <[email protected]>
Cc: Bjorn Helgaas <[email protected]>
Cc: [email protected] # v3.2+
---
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 3a5e7e2..07aa722 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");
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
