summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2026-02-07 02:09:36 +0300
committerBjorn Helgaas <bhelgaas@google.com>2026-02-07 02:09:36 +0300
commitd375df113c91fee62968af63c2c49f9571c3b6c4 (patch)
tree01c41ed49cf0a088f9e278500cda79bf16265ccd
parent62dea8718b7a7f6fc9b1408dd1f863f95191fbb6 (diff)
parentb79e0875fe8144fcb09e4fc1cf386cb3b2262480 (diff)
downloadlinux-d375df113c91fee62968af63c2c49f9571c3b6c4.tar.xz
Merge branch 'pci/controller/dwc-nxp-s32g'
* pci/controller/dwc-nxp-s32g: PCI: s32g: Skip Root Port removal during success
-rw-r--r--drivers/pci/controller/dwc/pcie-nxp-s32g.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/controller/dwc/pcie-nxp-s32g.c b/drivers/pci/controller/dwc/pcie-nxp-s32g.c
index 47745749f75c..b3ec38099fa3 100644
--- a/drivers/pci/controller/dwc/pcie-nxp-s32g.c
+++ b/drivers/pci/controller/dwc/pcie-nxp-s32g.c
@@ -282,12 +282,12 @@ static int s32g_pcie_parse_ports(struct device *dev, struct s32g_pcie *s32g_pp)
ret = s32g_pcie_parse_port(s32g_pp, of_port);
if (ret)
- goto err_port;
+ break;
}
-err_port:
- list_for_each_entry_safe(port, tmp, &s32g_pp->ports, list)
- list_del(&port->list);
+ if (ret)
+ list_for_each_entry_safe(port, tmp, &s32g_pp->ports, list)
+ list_del(&port->list);
return ret;
}