3 files changed, 10 insertions, 5 deletions

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 5bab73b91c20..e12a03cc2a6e 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1932,8 +1932,14 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
         }
 
 out:
-        if (!req && !(mq->flags & MMC_QUEUE_NEW_REQUEST))
-                /* release host only when there are no more requests */
+        if ((!req && !(mq->flags & MMC_QUEUE_NEW_REQUEST)) ||
+             (req && (req->cmd_flags & MMC_REQ_SPECIAL_MASK)))
+                /*
+                 * Release host when there are no more requests
+                 * and after special request(discard, flush) is done.
+                 * In case sepecial request, there is no reentry to
+                 * the 'mmc_blk_issue_rq' with 'mqrq_prev->req'.
+                 */
                 mmc_release_host(card->host);
         return ret;
 }
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index fa4e44ee7961..9447a0e970d1 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -22,9 +22,6 @@
 
 #define MMC_QUEUE_BOUNCESZ      65536
 
-
-#define MMC_REQ_SPECIAL_MASK    (REQ_DISCARD | REQ_FLUSH)
-
 /*
  * Prepare a MMC request. This just filters out odd stuff.
  */
diff --git a/drivers/mmc/card/queue.h b/drivers/mmc/card/queue.h
index 031bf6376c99..5752d50049a3 100644
--- a/drivers/mmc/card/queue.h
+++ b/drivers/mmc/card/queue.h
@@ -1,6 +1,8 @@
 #ifndef MMC_QUEUE_H
 #define MMC_QUEUE_H
 
+#define MMC_REQ_SPECIAL_MASK    (REQ_DISCARD | REQ_FLUSH)
+
 struct request;
 struct task_struct;