commit f6c97c82cb71614a257197d398e36dff15be138a
author Oluwafemi Adeyemi <aadeyemi@codeaurora.org> Mon Aug 22 10:53:44 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:16:31 2011 -0700
tree 4b7cc6a26504eeacbf2a7b8b8880d8ee8befc0c8
parent 34ec3697c70452298045d63b0759b1ed491b6b6b

mmc: msm_sdcc: Unconditionally send CMD52 after CMD53

Always send a dummy CMD52 after CMD53 for controllers
earlier than SDCC4

Signed-off-by: Oluwafemi Adeyemi <aadeyemi@codeaurora.org>

Conflicts:

	arch/arm/configs/msm7627-perf_defconfig
	arch/arm/configs/msm7627_defconfig
	arch/arm/configs/qsd-chromeos-st1q-qrdc_defconfig
	arch/arm/mach-msm/board-qrdc.c
	chromeos/config/armel/config.flavour.chromeos-st1q-qrdc

drivers/mmc/host/msm_sdcc.c

diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 92a3a39..453c6a0 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -1519,7 +1519,7 @@
 
 	host->curr.mrq = mrq;
 
-	if (host->plat->dummy52_required) {
+	if (!host->plat->sdcc_v4_sup) {
 		if (mrq->data && mrq->data->flags == MMC_DATA_WRITE) {
 			if (mrq->cmd->opcode == SD_IO_RW_EXTENDED ||
 				mrq->cmd->opcode == 54) {