From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 30 Sep 2024 22:49:19 +0000 (-0700)
Subject: mmc: mtk-sd: fix devm_clk_get_optional usage
X-Git-Tag: v6.13-rc1~153^2~50
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ed299eda8fbb37cb0e05c7001ab6a6b2627ec087;p=linux-block.git

mmc: mtk-sd: fix devm_clk_get_optional usage

This already returns NULL when not found. However, it can return
EPROBE_DEFER and should thus return here.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://lore.kernel.org/r/20240930224919.355359-4-rosenp@gmail.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
index 41ad650a6d1c..1efe434391af 100644
--- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c
@@ -2794,9 +2794,8 @@ static int msdc_drv_probe(struct platform_device *pdev)
 	if (!(mmc->caps2 & MMC_CAP2_NO_MMC)) {
 		host->crypto_clk = devm_clk_get_optional(&pdev->dev, "crypto");
 		if (IS_ERR(host->crypto_clk))
-			host->crypto_clk = NULL;
-		else
-			mmc->caps2 |= MMC_CAP2_CRYPTO;
+			return PTR_ERR(host->crypto_clk);
+		mmc->caps2 |= MMC_CAP2_CRYPTO;
 	}
 
 	host->irq = platform_get_irq(pdev, 0);