Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d43abf64 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: block: Fix request completion in the CQE timeout path"

parents 6cb75038 98fde434

drivers/mmc/core/queue.c

+1 −2
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ static enum blk_eh_timer_return mmc_cqe_timed_out(struct request *req) 
				mmc_cqe_recovery_notifier(mrq);

			return BLK_EH_RESET_TIMER;

		}

		/* No timeout (XXX: huh? comment doesn't make much sense) */



		pr_info("%s: %s: Timeout even before req reaching LDD, completing the req. Active reqs: %d Req: %p Tag: %d\n",

				mmc_hostname(host), __func__,
@@ -122,7 +121,7 @@ static enum blk_eh_timer_return mmc_cqe_timed_out(struct request *req) 
		mmc_log_string(host,

				"Timeout even before req reaching LDD,completing the req. Active reqs: %d Req: %p Tag: %d\n",

				mmc_cqe_qcnt(mq), req, req->tag);

		blk_mq_complete_request(req);

		/* The request has gone already */

		return BLK_EH_DONE;

	default:

		/* Timeout is handled by mmc core */