dra7xx->clk is not disabled+unprepared in some one the error paths,
specifically devm_phy_get() fails.
Fix by moving the clk_prepare_enable() stanza after all the devm_*()
resource grabbing but before all the goto-based error management. This way
it is possible to keep the 'return err' without the need to replace it with
a new goto statement.
Fixes: 5af9405397bf ("PCI: dra7xx: Get an optional clock")
Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Link: https://lore.kernel.org/lkml/202111301803.NOwoj4Jd-lkp@xxxxxxxxx/
Signed-off-by: Luca Ceresoli <luca@xxxxxxxxxxxxxxxx>
---
drivers/pci/controller/dwc/pci-dra7xx.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c
index 2ccc53869e13..d17cc088d07e 100644
--- a/drivers/pci/controller/dwc/pci-dra7xx.c
+++ b/drivers/pci/controller/dwc/pci-dra7xx.c
@@ -748,10 +748,6 @@ static int dra7xx_pcie_probe(struct platform_device *pdev)
return dev_err_probe(dev, PTR_ERR(dra7xx->clk),
"clock request failed");
- ret = clk_prepare_enable(dra7xx->clk);
- if (ret)
- return ret;
-
for (i = 0; i < phy_count; i++) {
snprintf(name, sizeof(name), "pcie-phy%d", i);
phy[i] = devm_phy_get(dev, name);
@@ -759,6 +755,10 @@ static int dra7xx_pcie_probe(struct platform_device *pdev)
return PTR_ERR(phy[i]);
}
+ ret = clk_prepare_enable(dra7xx->clk);
+ if (ret)
+ return ret;
+
for (i = 0; i < phy_count; i++) {
link[i] = device_link_add(dev, &phy[i]->dev, DL_FLAG_STATELESS);
if (!link[i]) {
--
2.25.1
