diff options
| author | Jaehoon Chung <jh80.chung@samsung.com> | 2011-07-13 17:02:16 +0900 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 16:07:30 +0200 |
| commit | 5aa5ee6b1ab7f8750822658844f4dcdb9af4c042 (patch) | |
| tree | 727eebc19f07ae5409ea2223d2b062af626bb429 | |
| parent | d500483ce89f7c0ebec7aec9236f07c0287f0b42 (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>
Change-Id: Ic86f89392503a5cf4c5d9e61c0a521956a3e08c0
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30688
Reviewed-by: Ulf HANSSON <ulf.hansson@stericsson.com>
Tested-by: Ulf HANSSON <ulf.hansson@stericsson.com>
| -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 461d2de4eec..cf6c472dfcd 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1206,6 +1206,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); |