diff options
| author | Stefan Wahren <stefan.wahren@i2se.com> | 2016-01-17 14:59:00 +0000 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2016-02-29 11:02:48 +0100 |
| commit | 1d6ad05777c27c7e8cfb32997a78c8252b85fbb4 (patch) | |
| tree | ef01465bfe09f5d0357f7d8c8ed5987002f6a614 /drivers/mmc/host/sdhci-iproc.c | |
| parent | e99369dc95fe99d4ee5f8a0f8bef59062365b7d1 (diff) | |
| download | linux-stable-1d6ad05777c27c7e8cfb32997a78c8252b85fbb4.tar.gz linux-stable-1d6ad05777c27c7e8cfb32997a78c8252b85fbb4.tar.bz2 linux-stable-1d6ad05777c27c7e8cfb32997a78c8252b85fbb4.zip | |
mmc: sdhci-iproc: Clean up platform allocations if shdci init fails
This patch adopts the changes from 475c9e43bfa7 ("mmc: sdhci-bcm2835:
Clean up platform allocations if sdhci init fails") to sdhci-iproc.
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Acked-by: Scott Branden <sbranden@broadcom.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/sdhci-iproc.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-iproc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c index 3b423b0ad8e7..e22060a80dbf 100644 --- a/drivers/mmc/host/sdhci-iproc.c +++ b/drivers/mmc/host/sdhci-iproc.c @@ -213,7 +213,11 @@ static int sdhci_iproc_probe(struct platform_device *pdev) host->caps1 = iproc_host->data->caps1; } - return sdhci_add_host(host); + ret = sdhci_add_host(host); + if (ret) + goto err; + + return 0; err: sdhci_pltfm_free(pdev); |