Skip to contentSkip to conversation

PCI: brcmstb: fix error return paths in probe()

PATCH In review Jim Quinlan 3 participants 3 messages Oct 1, 2020 – Oct 8, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: brcmstb: fix error return paths in probe()

Fixes two cases where we were returning without calling clk_disable_unprepare(). Although there is a common place to go on probe() errors (the 'fail' label), one can only jump there after executing brcm_pcie_setup(), so we have to add clk_disable_unprepare() calls to the two error paths.

Fixes b98f52bc6495 ("PCI: brcmstb: Add control of rescal reset")
---
 drivers/pci/controller/pcie-brcmstb.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-brcmstb.c +4 -1
index 6e7aa82a54a3..da2fefe80d47 100644
@@ -1269,8 +1269,10 @@ static int brcm_pcie_probe(struct platform_device *pdev)
 		return ret;
 	}
 	pcie->rescal = devm_reset_control_get_optional_shared(&pdev->dev, "rescal");
-	if (IS_ERR(pcie->rescal))
+	if (IS_ERR(pcie->rescal)) {
+		clk_disable_unprepare(pcie->clk);
 		return PTR_ERR(pcie->rescal);
+	}
 
 	ret = reset_control_deassert(pcie->rescal);
 	if (ret)
@@ -1279,6 +1281,7 @@ static int brcm_pcie_probe(struct platform_device *pdev)
 	ret = brcm_phy_start(pcie);
 	if (ret) {
 		reset_control_assert(pcie->rescal);
+		clk_disable_unprepare(pcie->clk);
 		return ret;
 	}
 
Signature · 1 line
2.17.1
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Jim Quinlan

Fixes two cases where we were returning without calling clk_disable_unprepare(). Although there is a common place to go on probe() errors (the 'fail' label), one can only jump there after executing brcm_pcie_setup(), so we have to add clk_disable_unprepare() calls to the two error paths.

Fixes b98f52bc6495 ("PCI: brcmstb: Add control of rescal reset")
Signature · 1 line
Florian
Reviewed-by on v1 1/1
#2 lore raw
In reply to Jim Quinlan
Quoted 11 lines · Jim Quinlan

Fixes two cases where we were returning without calling clk_disable_unprepare(). Although there is a common place to go on probe() errors (the 'fail' label), one can only jump there after executing brcm_pcie_setup(), so we have to add clk_disable_unprepare() calls to the two error paths.

Fixes b98f52bc6495 ("PCI: brcmstb: Add control of rescal reset")

---

Thanks!