Commit c302d35e authored Oct 20, 2014 by Kamal Mostafa Committed by Bjorn Helgaas Oct 27, 2014

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: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Andreas Noever <andreas.noever@gmail.com>

parent f114040e

drivers/pci/hotplug/pciehp_core.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -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");