lkml.org 
[lkml]   [2014]   [Oct]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] Revert duplicate "PCI: pciehp: Prevent NULL dereference during probe"
Date
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 <kamal@canonical.com>
Cc: Andreas Noever <andreas.noever@gmail.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org # 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


\
 
 \ /
  Last update: 2014-10-20 21:21    [W:0.181 / U:0.272 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site