Commit 8ecc3444 authored Mar 13, 2017 by Adrian Hunter Committed by Ulf Hansson Mar 14, 2017

mmc: block: Fix cmd error reset failure path



Commit 4e1f7800 ("mmc: block: break out mmc_blk_rw_cmd_abort()")
assumed the request had not completed, but in one case it had. Fix that.

Fixes: 4e1f7800 ("mmc: block: break out mmc_blk_rw_cmd_abort()")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 2602b740

drivers/mmc/core/block.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1701,6 +1701,7 @@ static void mmc_blk_issue_rw_rq(struct mmc_queue mq, struct request new_req)
		case MMC_BLK_CMD_ERR:
		req_pending = mmc_blk_rw_cmd_err(md, card, brq, old_req, req_pending);
		if (mmc_blk_reset(md, card->host, type)) {
		if (req_pending)
		mmc_blk_rw_cmd_abort(card, old_req);
		mmc_blk_rw_try_restart(mq, new_req);
		return;