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

			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;