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

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

mmc: tegra: handle mmc_of_parse() errors during probe 



Signed-off-by: default avatarSimon Baatz <gmbnomis@gmail.com>
Tested-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent d2cf6071

drivers/mmc/host/sdhci-tegra.c

+6 −3
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static const struct of_device_id sdhci_tegra_dt_match[] = { 
};

MODULE_DEVICE_TABLE(of, sdhci_tegra_dt_match);



static void sdhci_tegra_parse_dt(struct device *dev)

static int sdhci_tegra_parse_dt(struct device *dev)

{

	struct device_node *np = dev->of_node;

	struct sdhci_host *host = dev_get_drvdata(dev);
@@ -213,7 +213,7 @@ static void sdhci_tegra_parse_dt(struct device *dev) 
	struct sdhci_tegra *tegra_host = pltfm_host->priv;



	tegra_host->power_gpio = of_get_named_gpio(np, "power-gpios", 0);

	mmc_of_parse(host->mmc);

	return mmc_of_parse(host->mmc);

}



static int sdhci_tegra_probe(struct platform_device *pdev)
@@ -245,7 +245,9 @@ static int sdhci_tegra_probe(struct platform_device *pdev) 
	tegra_host->soc_data = soc_data;

	pltfm_host->priv = tegra_host;



	sdhci_tegra_parse_dt(&pdev->dev);

	rc = sdhci_tegra_parse_dt(&pdev->dev);

	if (rc)

		goto err_parse_dt;



	if (gpio_is_valid(tegra_host->power_gpio)) {

		rc = gpio_request(tegra_host->power_gpio, "sdhci_power");
@@ -279,6 +281,7 @@ static int sdhci_tegra_probe(struct platform_device *pdev) 
	if (gpio_is_valid(tegra_host->power_gpio))

		gpio_free(tegra_host->power_gpio);

err_power_req:

err_parse_dt:

err_alloc_tegra_host:

	sdhci_pltfm_free(pdev);

	return rc;