Skip to content

Commit

Permalink
Revert duplicate "PCI: pciehp: Prevent NULL dereference during probe"
Browse files Browse the repository at this point in the history
This reverts bceee4a ("PCI: pciehp: Prevent NULL dereference during
probe") because it was accidentally applied twice:

  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.

[bhelgaas: tidy changelog, drop stable tag]
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Andreas Noever <andreas.noever@gmail.com>
  • Loading branch information
Kamal Mostafa authored and Bjorn Helgaas committed Oct 27, 2014
1 parent f114040 commit c302d35
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions drivers/pci/hotplug/pciehp_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit c302d35

Please sign in to comment.