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

Commit b2dbd15d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: block: Fix an invalid use of req->cmd_flag in DISCARD operation"

parents 2e3a35e9 710b119d

drivers/mmc/card/block.c

+2 −3
Original line number Diff line number Diff line
@@ -2797,7 +2797,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) 
		/* complete ongoing async transfer before issuing discard */

		if (card->host->areq)

			mmc_blk_issue_rw_rq(mq, NULL);

		if (req->cmd_flags & REQ_SECURE &&

		if (cmd_flags & REQ_SECURE &&

			!(card->quirks & MMC_QUIRK_SEC_ERASE_TRIM_BROKEN))

			ret = mmc_blk_issue_secdiscard_rq(mq, req);

		else
@@ -2825,8 +2825,7 @@ out: 
	 */

	if ((!req && !(test_bit(MMC_QUEUE_NEW_REQUEST, &mq->flags))) ||

			((test_bit(MMC_QUEUE_URGENT_REQUEST, &mq->flags)) &&

			 !(mq->mqrq_cur->req->cmd_flags &

				MMC_REQ_NOREINSERT_MASK))) {

			 !(cmd_flags & MMC_REQ_NOREINSERT_MASK))) {

		if (mmc_card_need_bkops(card))

			mmc_start_bkops(card, false);

		/*