Commit c61bfb1c authored by Gaosheng Cui's avatar Gaosheng Cui Committed by Ulf Hansson
Browse files

mmc: mtk-sd: Fix missing clk_disable_unprepare in msdc_of_clock_parse() 



The clk_disable_unprepare() should be called in the error handling
of devm_clk_bulk_get_optional, fix it by replacing devm_clk_get_optional
and clk_prepare_enable by devm_clk_get_optional_enabled.

Fixes: f5eccd94 ("mmc: mediatek: Add subsys clock control for MT8192 msdc")
Signed-off-by: default avatarGaosheng Cui <cuigaosheng1@huawei.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20221125090141.3626747-1-cuigaosheng1@huawei.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent f4307b4d

drivers/mmc/host/mtk-sd.c

+2 −4
Original line number Diff line number Diff line
@@ -2588,13 +2588,11 @@ static int msdc_of_clock_parse(struct platform_device *pdev, 
			return PTR_ERR(host->src_clk_cg);

	}



	host->sys_clk_cg = devm_clk_get_optional(&pdev->dev, "sys_cg");

	/* If present, always enable for this clock gate */

	host->sys_clk_cg = devm_clk_get_optional_enabled(&pdev->dev, "sys_cg");

	if (IS_ERR(host->sys_clk_cg))

		host->sys_clk_cg = NULL;



	/* If present, always enable for this clock gate */

	clk_prepare_enable(host->sys_clk_cg);



	host->bulk_clks[0].id = "pclk_cg";

	host->bulk_clks[1].id = "axi_cg";

	host->bulk_clks[2].id = "ahb_cg";