The pci_find_pcie_root_port() would return NULL if the given
dev is already a Root Port, it looks like unfriendly to the
PCIe Root Port device, Thierry and Bjorn suggest to let this
function return the given dev under this circumstances.
Fixes: 0e405232871d6 ("PCI: fix oops when try to find Root Port for a PCI
device")
Suggested-by: Thierry Reding <thierry.red...@gmail.com>
Suggested-by: Bjorn Helgaas <helg...@kernel.org>
Signed-off-by: Thierry Reding <thierry.red...@gmail.com>
Signed-off-by: Ding Tianhong <dingtianh...@huawei.com>
---
drivers/pci/pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 7e2022f..352bb53 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -514,7 +514,7 @@ struct resource *pci_find_resource(struct pci_dev *dev,
struct resource *res)
*/
struct pci_dev *pci_find_pcie_root_port(struct pci_dev *dev)
{
- struct pci_dev *bridge, *highest_pcie_bridge = NULL;
+ struct pci_dev *bridge, *highest_pcie_bridge = dev;
bridge = pci_upstream_bridge(dev);
while (bridge && pci_is_pcie(bridge)) {
--
1.8.3.1
