[PATCH] PCI: dwc: Perform cleanup in the error path of dw_pcie_resume_noirq()

[PATCH] PCI: dwc: Perform cleanup in the error path of dw_pcie_resume_noirq()

[Manivannan Sadhasivam]

From: Manivannan Sadhasivam <manivannan.sadhasivam@oss.qualcomm.com>

If the dw_pcie_resume_noirq() API fails, it just returns the errno without
doing cleanup in the error path, leading to resource leak.

So perform cleanup in the error path.

Fixes: 4774faf854f5 ("PCI: dwc: Implement generic suspend/resume functionality")
Reported-by: Senchuan Zhang <zhangsenchuan@eswincomputing.com>
Closes: https://lore.kernel.org/linux-pci/78296255.3869.19c8eb694d6.Coremail.zhangsenchuan@eswincomputing.com
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@oss.qualcomm.com>
---
 drivers/pci/controller/dwc/pcie-designware-host.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index ba183fc3e77c..a74339982c24 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -1304,15 +1304,24 @@ int dw_pcie_resume_noirq(struct dw_pcie *pci)
 
 	ret = dw_pcie_start_link(pci);
 	if (ret)
-		return ret;
+		goto err_deinit;
 
 	ret = dw_pcie_wait_for_link(pci);
-	if (ret)
-		return ret;
+	if (ret == -ETIMEDOUT)
+		goto err_stop_link;
 
 	if (pci->pp.ops->post_init)
 		pci->pp.ops->post_init(&pci->pp);
 
+	return 0;
+
+err_stop_link:
+	dw_pcie_stop_link(pci);
+
+err_deinit:
+	if (pci->pp.ops->deinit)
+		pci->pp.ops->deinit(&pci->pp);
+
 	return ret;
 }
 EXPORT_SYMBOL_GPL(dw_pcie_resume_noirq);
-- 
2.51.0

Re: [PATCH] PCI: dwc: Perform cleanup in the error path of dw_pcie_resume_noirq()

[Manivannan Sadhasivam]

On Thu, 26 Feb 2026 19:09:51 +0530, Manivannan Sadhasivam wrote:
> If the dw_pcie_resume_noirq() API fails, it just returns the errno without
> doing cleanup in the error path, leading to resource leak.
> 
> So perform cleanup in the error path.
> 
> 

Applied, thanks!

[1/1] PCI: dwc: Perform cleanup in the error path of dw_pcie_resume_noirq()
      commit: cb5b15bf7a40d76b710fc5367d27f6897ecaa552

Best regards,
-- 
Manivannan Sadhasivam <mani@kernel.org>