lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: tegra: handle mmc_of_parse() errors during probe

Browse Source 
Signed-off-by: Simon Baatz <gmbnomis@gmail.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Simon Baatz
2013-06-09 22:14:16 +02:00
committed by Chris Ball
parent d2cf6071cc
commit 47caa84fb6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mmc/host/sdhci-tegra.c
View File

@@ -205,7 +205,7 @@ static const struct of_device_id sdhci_tegra_dt_match[] = {
}; };
MODULE_DEVICE_TABLE(of, 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 device_node *np = dev->of_node;
struct sdhci_host *host = dev_get_drvdata(dev); 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; struct sdhci_tegra *tegra_host = pltfm_host->priv;
tegra_host->power_gpio = of_get_named_gpio(np, "power-gpios", 0); 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) 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; tegra_host->soc_data = soc_data;
pltfm_host->priv = tegra_host; 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)) { if (gpio_is_valid(tegra_host->power_gpio)) {
rc = gpio_request(tegra_host->power_gpio, "sdhci_power"); rc = gpio_request(tegra_host->power_gpio, "sdhci_power");
@@ -279,6 +281,7 @@ err_clk_get:
if (gpio_is_valid(tegra_host->power_gpio)) if (gpio_is_valid(tegra_host->power_gpio))
gpio_free(tegra_host->power_gpio); gpio_free(tegra_host->power_gpio);
err_power_req: err_power_req:
err_parse_dt:
err_alloc_tegra_host: err_alloc_tegra_host:
sdhci_pltfm_free(pdev); sdhci_pltfm_free(pdev);
return rc; return rc;