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

Commit d2cf6071 authored by Simon Baatz's avatar Simon Baatz Committed by Chris Ball
Browse files

mmc: sdhci-pxav3: handle mmc_of_parse() errors during probe 



Signed-off-by: default avatarSimon Baatz <gmbnomis@gmail.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent b8857696

drivers/mmc/host/sdhci-pxav3.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -252,7 +252,9 @@ static int sdhci_pxav3_probe(struct platform_device *pdev) 




	match = of_match_device(of_match_ptr(sdhci_pxav3_of_match), &pdev->dev);

	match = of_match_device(of_match_ptr(sdhci_pxav3_of_match), &pdev->dev);

	if (match) {

	if (match) {

		mmc_of_parse(host->mmc);

		ret = mmc_of_parse(host->mmc);

		if (ret)

			goto err_of_parse;

		sdhci_get_of_property(pdev);

		sdhci_get_of_property(pdev);

		pdata = pxav3_get_mmc_pdata(dev);

		pdata = pxav3_get_mmc_pdata(dev);

	} else if (pdata) {

	} else if (pdata) {
@@ -313,10 +315,11 @@ static int sdhci_pxav3_probe(struct platform_device *pdev) 




	return 0;

	return 0;





err_of_parse:

err_cd_req:

err_add_host:

err_add_host:

	clk_disable_unprepare(clk);

	clk_disable_unprepare(clk);

	clk_put(clk);

	clk_put(clk);

err_cd_req:

err_clk_get:

err_clk_get:

	sdhci_pltfm_free(pdev);

	sdhci_pltfm_free(pdev);

	kfree(pxa);

	kfree(pxa);