2017-08-08 05:47:04

by Arvind Yadav

Subject: [PATCH] mmc: wmt-sdmmc: Handle return value of clk_prepare_enable

clk_prepare_enable() can fail here and we must check its return value.

Signed-off-by: Arvind Yadav <[email protected]>
---
drivers/mmc/host/wmt-sdmmc.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/wmt-sdmmc.c b/drivers/mmc/host/wmt-sdmmc.c
index 21ebba8..e64f930 100644
--- a/drivers/mmc/host/wmt-sdmmc.c
+++ b/drivers/mmc/host/wmt-sdmmc.c
@@ -856,7 +856,9 @@ static int wmt_mci_probe(struct platform_device *pdev)
goto fail5;
}

- clk_prepare_enable(priv->clk_sdmmc);
+ ret = clk_prepare_enable(priv->clk_sdmmc);
+ if (ret)
+ goto fail6;

/* configure the controller to a known 'ready' state */
wmt_reset_hardware(mmc);
@@ -866,6 +868,8 @@ static int wmt_mci_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "WMT SDHC Controller initialized\n");

return 0;
+fail6:
+ clk_put(priv->clk_sdmmc);
fail5:
free_irq(dma_irq, priv);
fail4:
--
1.9.1

2017-08-08 10:38:44

by Ulf Hansson

Subject: Re: [PATCH] mmc: wmt-sdmmc: Handle return value of clk_prepare_enable

On 8 August 2017 at 07:46, Arvind Yadav <[email protected]> wrote:
> clk_prepare_enable() can fail here and we must check its return value.
>
> Signed-off-by: Arvind Yadav <[email protected]>

Thanks, applied for next!

Kind regards
Uffe

> ---
> drivers/mmc/host/wmt-sdmmc.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/wmt-sdmmc.c b/drivers/mmc/host/wmt-sdmmc.c
> index 21ebba8..e64f930 100644
> --- a/drivers/mmc/host/wmt-sdmmc.c
> +++ b/drivers/mmc/host/wmt-sdmmc.c
> @@ -856,7 +856,9 @@ static int wmt_mci_probe(struct platform_device *pdev)
> goto fail5;
> }
>
> - clk_prepare_enable(priv->clk_sdmmc);
> + ret = clk_prepare_enable(priv->clk_sdmmc);
> + if (ret)
> + goto fail6;
>
> /* configure the controller to a known 'ready' state */
> wmt_reset_hardware(mmc);
> @@ -866,6 +868,8 @@ static int wmt_mci_probe(struct platform_device *pdev)
> dev_info(&pdev->dev, "WMT SDHC Controller initialized\n");
>
> return 0;
> +fail6:
> + clk_put(priv->clk_sdmmc);
> fail5:
> free_irq(dma_irq, priv);
> fail4:
> --
> 1.9.1
>