diff --git a/[refs] b/[refs] index 25febb1c0b18..902cb76376d8 100644 --- 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 index 38d01492a52b..1ff5486213fb 100644 --- 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);