1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 325cf60c65e5..f9ed5e23f145 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -481,6 +481,13 @@ mmc_omap_xfer_done(struct mmc_omap_host *host, struct mmc_data *data)
         if (!data) {
                 struct mmc_request *mrq = host->mrq;
 
+                /* TC before CC from CMD6 - don't know why, but it happens */
+                if (host->cmd && host->cmd->opcode == 6 &&
+                    host->response_busy) {
+                        host->response_busy = 0;
+                        return;
+                }
+
                 host->mrq = NULL;
                 mmc_request_done(host->mmc, mrq);
                 return;