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

Commit ad160c8d authored by Maya Erez's avatar Maya Erez
Browse files

mmc: card: fix timeout on erase/trim command due to sanitize 



Sanitize command should never be issued with timeout argument of 0,
cause then it invokes timeout.
Moreover, sanitize command should not be called from routines that
does erase/trim/secure-discard commands, but only from a routine that
issues the sanitize specifically.(mmc_blk_issue_sanitize_rq)

Change-Id: I2fc9d17d876de3440f7cdee5fce0158a919c7c6f
Signed-off-by: default avatarYaniv Gardi <ygardi@codeaurora.org>
Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
parent 6c644c0f

drivers/mmc/card/block.c

+0 −7
Original line number Diff line number Diff line
@@ -1439,13 +1439,6 @@ retry: 
			goto out;

	}



	if (mmc_can_sanitize(card)) {

		trace_mmc_blk_erase_start(EXT_CSD_SANITIZE_START, 0, 0);

		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

				 EXT_CSD_SANITIZE_START, 1,

				 MMC_SANITIZE_REQ_TIMEOUT);

		trace_mmc_blk_erase_end(EXT_CSD_SANITIZE_START, 0, 0);

	}

out_retry:

	if (err && !mmc_blk_reset(md, card->host, type))

		goto retry;