Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 278d0962 authored by Shawn Lin's avatar Shawn Lin Committed by Ulf Hansson
Browse files

mmc: sdhci-of-arasan: fix missing sdhci_pltfm_free for err handling 



Currently, some err handling of sdhci_arasan_probe return directly
without calling sdhci_pltfm_free. This patch fixes them.

Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 84275048

drivers/mmc/host/sdhci-of-arasan.c

+8 −7
Original line number Diff line number Diff line
@@ -147,19 +147,21 @@ static int sdhci_arasan_probe(struct platform_device *pdev) 
	sdhci_arasan->clk_ahb = devm_clk_get(&pdev->dev, "clk_ahb");

	if (IS_ERR(sdhci_arasan->clk_ahb)) {

		dev_err(&pdev->dev, "clk_ahb clock not found.\n");

		return PTR_ERR(sdhci_arasan->clk_ahb);

		ret = PTR_ERR(sdhci_arasan->clk_ahb);

		goto err_pltfm_free;

	}



	clk_xin = devm_clk_get(&pdev->dev, "clk_xin");

	if (IS_ERR(clk_xin)) {

		dev_err(&pdev->dev, "clk_xin clock not found.\n");

		return PTR_ERR(clk_xin);

		ret = PTR_ERR(clk_xin);

		goto err_pltfm_free;

	}



	ret = clk_prepare_enable(sdhci_arasan->clk_ahb);

	if (ret) {

		dev_err(&pdev->dev, "Unable to enable AHB clock.\n");

		return ret;

		goto err_pltfm_free;

	}



	ret = clk_prepare_enable(clk_xin);
@@ -179,17 +181,16 @@ static int sdhci_arasan_probe(struct platform_device *pdev) 


	ret = sdhci_add_host(host);

	if (ret)

		goto err_pltfm_free;

		goto clk_disable_all;



	return 0;



err_pltfm_free:

	sdhci_pltfm_free(pdev);

clk_disable_all:

	clk_disable_unprepare(clk_xin);

clk_dis_ahb:

	clk_disable_unprepare(sdhci_arasan->clk_ahb);



err_pltfm_free:

	sdhci_pltfm_free(pdev);

	return ret;

}