From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Baatz Subject: [RESEND PATCH V3 6/8] mmc: tegra: handle mmc_of_parse() errors during probe Date: Sun, 9 Jun 2013 22:14:16 +0200 Message-ID: <1370808858-32241-7-git-send-email-gmbnomis@gmail.com> References: <1370808858-32241-1-git-send-email-gmbnomis@gmail.com> Return-path: In-Reply-To: <1370808858-32241-1-git-send-email-gmbnomis@gmail.com> Sender: linux-mmc-owner@vger.kernel.org To: linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org Cc: Chris Ball , Jason Cooper , Andrew Lunn , Guennadi Liakhovetski , Thomas Petazzoni , Ulf Hansson List-Id: devicetree@vger.kernel.org Signed-off-by: Simon Baatz --- drivers/mmc/host/sdhci-tegra.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index e0dba74..7eb62f8 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -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"); @@ -278,6 +280,7 @@ err_add_host: err_clk_get: if (gpio_is_valid(tegra_host->power_gpio)) gpio_free(tegra_host->power_gpio); +err_parse_dt: err_power_req: err_alloc_tegra_host: sdhci_pltfm_free(pdev); -- 1.7.9.5