]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: mtk-sd: fix devm_clk_get_optional usage
authorRosen Penev <rosenp@gmail.com>
Mon, 30 Sep 2024 22:49:19 +0000 (15:49 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2024 19:03:10 +0000 (20:03 +0100)
[ Upstream commit ed299eda8fbb37cb0e05c7001ab6a6b2627ec087 ]

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>
Stable-dep-of: 2508925fb346 ("mmc: mtk-sd: Fix MMC_CAP2_CRYPTO flag setting")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mmc/host/mtk-sd.c

index 73f97f985daf4a6f159760f05bdfc158749231fd..83e72914818610c617a3e14960f1a63c406a5810 100644 (file)
@@ -2773,9 +2773,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);