]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: davinci_mmc: Handle error for clk_enable
authorJiasheng Jiang <jiasheng@iscas.ac.cn>
Tue, 8 Mar 2022 07:14:15 +0000 (15:14 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Apr 2022 12:14:47 +0000 (14:14 +0200)
[ Upstream commit 09e7af76db02c74f2a339b3cb2d95460fa2ddbe4 ]

As the potential failure of the clk_enable(),
it should be better to check it and return error
if fails.

Fixes: bbce5802afc5 ("davinci: mmc: updates to suspend/resume implementation")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20220308071415.1093393-1-jiasheng@iscas.ac.cn
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mmc/host/davinci_mmc.c

index e6f14257a7d0648b1678eb8df1836f7ceb8df40c..70d04962f53ac7b584b9e6560e93a6f53a5ea744 100644 (file)
@@ -1389,8 +1389,12 @@ static int davinci_mmcsd_suspend(struct device *dev)
 static int davinci_mmcsd_resume(struct device *dev)
 {
        struct mmc_davinci_host *host = dev_get_drvdata(dev);
+       int ret;
+
+       ret = clk_enable(host->clk);
+       if (ret)
+               return ret;
 
-       clk_enable(host->clk);
        mmc_davinci_reset_ctrl(host, 0);
 
        return 0;