[PATCH] mci: imx-esdhc: fix error handling during probe

[PATCH] mci: imx-esdhc: fix error handling during probe

[Marco Felsch]

Currently the the driver don't handle any error and return immediately.
Handling the errors correctly is a must to support defered probing.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 drivers/mci/imx-esdhc.c | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c
index f71ca539ed..db3450a26d 100644
--- a/drivers/mci/imx-esdhc.c
+++ b/drivers/mci/imx-esdhc.c
@@ -653,20 +653,24 @@ static int fsl_esdhc_probe(struct device_d *dev)
 	dma_set_mask(dev, DMA_BIT_MASK(32));
 
 	host->clk = clk_get(dev, socdata->clkidx);
-	if (IS_ERR(host->clk))
-		return PTR_ERR(host->clk);
+	if (IS_ERR(host->clk)) {
+		ret = PTR_ERR(host->clk);
+		goto err_free;
+	}
 
 	ret = clk_enable(host->clk);
 	if (ret) {
 		dev_err(dev, "Failed to enable clock: %s\n",
 			strerror(ret));
-		return ret;
+		goto err_clk_put;
 	}
 
 	host->dev = dev;
 	iores = dev_request_mem_resource(dev, 0);
-	if (IS_ERR(iores))
-		return PTR_ERR(iores);
+	if (IS_ERR(iores)) {
+		ret = PTR_ERR(iores);
+		goto err_clk_disable;
+	}
 	host->regs = IOMEM(iores->start);
 
 	caps = esdhc_read32(host, SDHCI_CAPABILITIES);
@@ -709,7 +713,21 @@ static int fsl_esdhc_probe(struct device_d *dev)
 
 	dev->priv = host;
 
-	return mci_register(&host->mci);
+	ret = mci_register(&host->mci);
+	if (ret)
+		goto err_release_res;
+
+	return 0;
+
+err_release_res:
+	release_region(iores);
+err_clk_disable:
+	clk_disable(host->clk);
+err_clk_put:
+	clk_put(host->clk);
+err_free:
+	free(host);
+	return ret;
 }
 
 static struct esdhc_soc_data esdhc_imx25_data = {
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] mci: imx-esdhc: fix error handling during probe

[Sascha Hauer]

On Wed, Sep 11, 2019 at 05:07:06PM +0200, Marco Felsch wrote:
> Currently the the driver don't handle any error and return immediately.
> Handling the errors correctly is a must to support defered probing.
> 
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> ---
>  drivers/mci/imx-esdhc.c | 30 ++++++++++++++++++++++++------
>  1 file changed, 24 insertions(+), 6 deletions(-)

Applied, thanks

Lucas, it gets time for your probe-devices-on-demand series ;)

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox