mmc: mxcmmc: Handle return value of clk_prepare_enable
authorArvind Yadav <arvind.yadav.cs@gmail.com>
Tue, 8 Aug 2017 05:57:43 +0000 (11:27 +0530)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 30 Aug 2017 12:01:55 +0000 (14:01 +0200)
clk_prepare_enable() can fail here and we must check its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/mxcmmc.c

index f2b6639634d264c77301d0f1cbc8a0bf9e0b8000..1d5418e4efaeb0f2a07002b19e004079e9ce0bfe 100644 (file)
@@ -1103,8 +1103,13 @@ static int mxcmci_probe(struct platform_device *pdev)
                goto out_free;
        }
 
-       clk_prepare_enable(host->clk_per);
-       clk_prepare_enable(host->clk_ipg);
+       ret = clk_prepare_enable(host->clk_per);
+       if (ret)
+               goto out_free;
+
+       ret = clk_prepare_enable(host->clk_ipg);
+       if (ret)
+               goto out_clk_per_put;
 
        mxcmci_softreset(host);
 
@@ -1173,8 +1178,9 @@ out_free_dma:
                dma_release_channel(host->dma);
 
 out_clk_put:
-       clk_disable_unprepare(host->clk_per);
        clk_disable_unprepare(host->clk_ipg);
+out_clk_per_put:
+       clk_disable_unprepare(host->clk_per);
 
 out_free:
        mmc_free_host(mmc);
@@ -1217,10 +1223,17 @@ static int __maybe_unused mxcmci_resume(struct device *dev)
 {
        struct mmc_host *mmc = dev_get_drvdata(dev);
        struct mxcmci_host *host = mmc_priv(mmc);
+       int ret;
 
-       clk_prepare_enable(host->clk_per);
-       clk_prepare_enable(host->clk_ipg);
-       return 0;
+       ret = clk_prepare_enable(host->clk_per);
+       if (ret)
+               return ret;
+
+       ret = clk_prepare_enable(host->clk_ipg);
+       if (ret)
+               clk_disable_unprepare(host->clk_per);
+
+       return ret;
 }
 
 static SIMPLE_DEV_PM_OPS(mxcmci_pm_ops, mxcmci_suspend, mxcmci_resume);