Commit c302d35e authored by Kamal Mostafa's avatar Kamal Mostafa Committed by Bjorn Helgaas

Revert duplicate "PCI: pciehp: Prevent NULL dereference during probe"

This reverts bceee4a9 ("PCI: pciehp: Prevent NULL dereference during
probe") because it was accidentally applied twice:

  62e4492c ("PCI: Prevent NULL dereference during pciehp probe")
  bceee4a9 ("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: default avatarKamal Mostafa <kamal@canonical.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
CC: Andreas Noever <andreas.noever@gmail.com>
parent f114040e
...@@ -262,13 +262,6 @@ static int pciehp_probe(struct pcie_device *dev) ...@@ -262,13 +262,6 @@ static int pciehp_probe(struct pcie_device *dev)
goto err_out_none; 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); ctrl = pcie_init(dev);
if (!ctrl) { if (!ctrl) {
dev_err(&dev->device, "Controller initialization failed\n"); dev_err(&dev->device, "Controller initialization failed\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment