From b8f7f0a0daf746bdb489b4ac10a8c2440c280d5d Mon Sep 17 00:00:00 2001
From: Sahitya Tummala <stummala@codeaurora.org>
Date: Mon, 2 May 2011 18:06:05 +0530
Subject: [PATCH] --- yaml --- r: 270251 b: refs/heads/master c:
 dce7c756c84160424b3aea5ec36f221946bdc6f7 h: refs/heads/master i:   270249:
 1e57ec17ce2599873ec34666563d02a754bb47bd   270247:
 283db234933ead4706b1b9000f55ca635f2e15b7 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/mmc/host/msm_sdcc.c | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f17b6f95433d..c2c8d639ae47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e91957e70d2aea529ff2055b8fbd575f2d7b8c3b
+refs/heads/master: dce7c756c84160424b3aea5ec36f221946bdc6f7
diff --git a/trunk/drivers/mmc/host/msm_sdcc.c b/trunk/drivers/mmc/host/msm_sdcc.c
index cfe0c893ef04..0f0b4fdb62ab 100644
--- a/trunk/drivers/mmc/host/msm_sdcc.c
+++ b/trunk/drivers/mmc/host/msm_sdcc.c
@@ -1215,7 +1215,7 @@ msmsdcc_probe(struct platform_device *pdev)
 	host->base = ioremap(memres->start, PAGE_SIZE);
 	if (!host->base) {
 		ret = -ENOMEM;
-		goto out;
+		goto host_free;
 	}
 
 	host->cmd_irqres = cmd_irqres;
@@ -1230,13 +1230,15 @@ msmsdcc_probe(struct platform_device *pdev)
 	/*
 	 * Setup DMA
 	 */
-	msmsdcc_init_dma(host);
+	ret = msmsdcc_init_dma(host);
+	if (ret)
+		goto ioremap_free;
 
 	/* Get our clocks */
 	host->pclk = clk_get(&pdev->dev, "sdc_pclk");
 	if (IS_ERR(host->pclk)) {
 		ret = PTR_ERR(host->pclk);
-		goto host_free;
+		goto dma_free;
 	}
 
 	host->clk = clk_get(&pdev->dev, "sdc_clk");
@@ -1377,6 +1379,12 @@ msmsdcc_probe(struct platform_device *pdev)
 	clk_put(host->clk);
  pclk_put:
 	clk_put(host->pclk);
+dma_free:
+	dma_free_coherent(NULL, sizeof(struct msmsdcc_nc_dmadata),
+				host->dma.nc, host->dma.nc_busaddr);
+ioremap_free:
+	tasklet_kill(&host->dma_tlet);
+	iounmap(host->base);
  host_free:
 	mmc_free_host(mmc);
  out: