Commit 393f9a08 authored Jul 13, 2011 by Jaehoon Chung Committed by Chris Ball Jul 21, 2011

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>

parent 7937e878

drivers/mmc/card/block.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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);