---

yaml --- r: 255228 b: refs/heads/master c: 393f9a0 h: refs/heads/master v: v3
git-mirror · Jul 21, 2011 · dd16f10 · dd16f10
1 parent 42d3bcf
commit dd16f10
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7937e878f91ccc32c09177f44cfdc45183d78605
+refs/heads/master: 393f9a08e2ee72e42379489a5781feaf9c406d5f
diff --git a/trunk/drivers/mmc/card/block.c b/trunk/drivers/mmc/card/block.c
@@ -1200,6 +1200,9 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
 		else
 			ret = mmc_blk_issue_discard_rq(mq, req);
 	} else if (req && req->cmd_flags & REQ_FLUSH) {
+		/* complete ongoing async transfer before issuing flush */
+		if (card->host->areq)
+			mmc_blk_issue_rw_rq(mq, NULL);
 		ret = mmc_blk_issue_flush(mq, req);
 	} else {
 		ret = mmc_blk_issue_rw_rq(mq, req);