diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-10-23 00:19:18 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:34 -0800 |
| commit | 6b8121f30d001e2cbae6ede6822f70c73dc3100a (patch) | |
| tree | 32edee2c1d52b1d3390805fb1950537e84d07d2f /drivers/mmc/host/sdhci-tegra.c | |
| parent | c788a318f6d5e8ebf44286fedddad6c15c4a617c (diff) | |
HACK merge fixups for compile
Rebase-Id: Rbc628711479b187a90437bea94776066c7a58b54
Diffstat (limited to 'drivers/mmc/host/sdhci-tegra.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index e624b9034f54..777ea7807a3f 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -503,7 +503,8 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev) tegra_host = kzalloc(sizeof(struct tegra_sdhci_host), GFP_KERNEL); if (tegra_host == NULL) { dev_err(mmc_dev(host->mmc), "failed to allocate tegra host\n"); - return -ENOMEM; + rc = -ENOMEM; + goto err_no_mem; } #ifdef CONFIG_MMC_EMBEDDED_SDIO @@ -680,9 +681,10 @@ err_cd_req: gpio_free(plat->power_gpio); } err_power_req: +err_no_mem: + kfree(tegra_host); err_no_plat: sdhci_pltfm_free(pdev); - kfree(tegra_host); return rc; } |