diff options
| author | Kamal Mostafa <kamal@canonical.com> | 2014-10-20 21:08:10 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-27 18:42:43 +0100 |
| commit | c302d35eac32bbd99ed9e3dc5b03d58073c78e86 (patch) | |
| tree | d3315530254113e7f082a51b2c6709a7e9d47e80 /drivers/pci | |
| parent | Linux 3.18-rc1 (diff) | |
| download | linux-c302d35eac32bbd99ed9e3dc5b03d58073c78e86.tar.xz linux-c302d35eac32bbd99ed9e3dc5b03d58073c78e86.zip | |
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 <kamal@canonical.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Andreas Noever <andreas.noever@gmail.com>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_core.c | 7 |
1 files changed, 0 insertions, 7 deletions
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"); |