[PATCH] mmc: host: Fix mmc_alloc_host() error path

[Fabio Estevam <festevam@xxxxxxxxx>]

From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>

If mmc_gpio_alloc() fails we miss to call 'kfree(host)', so rearrange
the error path to fix it. 

Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
---
 drivers/mmc/core/host.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 99a9c90..01fa1ed 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -566,10 +566,8 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
 		host->index = err;
 	spin_unlock(&mmc_host_lock);
 	idr_preload_end();
-	if (err < 0) {
-		kfree(host);
-		return NULL;
-	}
+	if (err < 0)
+		goto err_kfree;
 
 	dev_set_name(&host->class_dev, "mmc%d", host->index);
 
@@ -578,10 +576,8 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
 	host->class_dev.class = &mmc_host_class;
 	device_initialize(&host->class_dev);
 
-	if (mmc_gpio_alloc(host)) {
-		put_device(&host->class_dev);
-		return NULL;
-	}
+	if (mmc_gpio_alloc(host))
+		goto err_put_device;
 
 	mmc_host_clk_init(host);
 
@@ -605,6 +601,12 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
 	host->max_blk_count = PAGE_CACHE_SIZE / 512;
 
 	return host;
+
+err_put_device:
+	put_device(&host->class_dev);
+err_kfree:
+	kfree(host);
+	return NULL;
 }
 
 EXPORT_SYMBOL(mmc_alloc_host);
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html