From: Seungwon Jeon <tgih.jun@samsung.com>
Date: Tue, 22 May 2012 04:01:13 +0000 (+0900)
Subject: mmc: dw_mmc: fix incorrect setting of host->data of NULL
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fda5f736864c46324dbc50246ef1ca0e84ebf4ae;p=deliverable%2Flinux.git

mmc: dw_mmc: fix incorrect setting of host->data of NULL

Setting host->data to NULL is incorrect sequence in
dw_mci_command_complete. This early setting makes the skip of
dma_unmap_sg in dw_mci_dma_cleanup.

Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
Acked-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
---

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 98fe02347d59..b070ee542c8e 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -941,8 +941,8 @@ static void dw_mci_command_complete(struct dw_mci *host, struct mmc_command *cmd
 			mdelay(20);
 
 		if (cmd->data) {
-			host->data = NULL;
 			dw_mci_stop_dma(host);
+			host->data = NULL;
 		}
 	}
 }