diff options
author | Jaehoon Chung <jh80.chung@samsung.com> | 2011-07-13 17:02:16 +0900 |
---|---|---|
committer | Jason Liu <r64343@freescale.com> | 2012-07-20 13:24:44 +0800 |
commit | ac32d8ed078871bd31c5fbf899fb800869d0b451 (patch) | |
tree | 517fd5a8259e3ecf8ad11e5d35a4afe3d1dd93b6 /drivers/mmc/card/block.c | |
parent | e10c078584ba0116fd315703772d79cecbaef57c (diff) |
mmc: block: fixed NULL pointer dereference
We already check for ongoing async transfers when handling discard
requests, but not in mmc_blk_issue_flush(). This patch fixes that
omission.
Tested with an SDHCI controller and eMMC4.41.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Per Forlin <per.forlin@linaro.org>
Cc: <stable@kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/card/block.c')
-rw-r--r-- | drivers/mmc/card/block.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index b7d22dd8d23c..453695e29e3c 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1208,6 +1208,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); |