1 files changed, 20 insertions, 2 deletions

diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index d630d9861e7b..5e0971016ac5 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -22,7 +22,6 @@
 
 #define MMC_QUEUE_BOUNCESZ      65536
 
-#define MMC_QUEUE_SUSPENDED     (1 << 0)
 
 #define MMC_REQ_SPECIAL_MASK    (REQ_DISCARD | REQ_FLUSH)
 
@@ -72,6 +71,10 @@ static int mmc_queue_thread(void *d)
                         set_current_state(TASK_RUNNING);
                         cmd_flags = req ? req->cmd_flags : 0;
                         mq->issue_fn(mq, req);
+                        if (mq->flags & MMC_QUEUE_NEW_REQUEST) {
+                                mq->flags &= ~MMC_QUEUE_NEW_REQUEST;
+                                continue; /* fetch again */
+                        }
 
                         /*
                          * Current request becomes previous request
@@ -113,6 +116,8 @@ static void mmc_request_fn(struct request_queue *q)
 {
         struct mmc_queue *mq = q->queuedata;
         struct request *req;
+        unsigned long flags;
+        struct mmc_context_info *cntx;
 
         if (!mq) {
                 while ((req = blk_fetch_request(q)) != NULL) {
@@ -122,7 +127,20 @@ static void mmc_request_fn(struct request_queue *q)
                 return;
         }
 
-        if (!mq->mqrq_cur->req && !mq->mqrq_prev->req)
+        cntx = &mq->card->host->context_info;
+        if (!mq->mqrq_cur->req && mq->mqrq_prev->req) {
+                /*
+                 * New MMC request arrived when MMC thread may be
+                 * blocked on the previous request to be complete
+                 * with no current request fetched
+                 */
+                spin_lock_irqsave(&cntx->lock, flags);
+                if (cntx->is_waiting_last_req) {
+                        cntx->is_new_req = true;
+                        wake_up_interruptible(&cntx->wait);
+                }
+                spin_unlock_irqrestore(&cntx->lock, flags);
+        } else if (!mq->mqrq_cur->req && !mq->mqrq_prev->req)
                 wake_up_process(mq->thread);
 }