Commit 22d7e85f authored by Robin van der Gracht's avatar Robin van der Gracht Committed by Ulf Hansson
Browse files

mmc: core: Fixed bug in one erase-group budget TRIM 



When requesting a trim for several bytes, everything up to the next
erase-group is erased. This causes data corruption.

Signed-off-by: default avatarRobin van der Gracht <robin@protonic.nl>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 0df9d2ea

drivers/mmc/core/core.c

+2 −3
Original line number Diff line number Diff line
@@ -2227,9 +2227,8 @@ int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr, 
	 * and call mmc_do_erase() twice if necessary. This special case is

	 * identified by the card->eg_boundary flag.

	 */

	if ((arg & MMC_TRIM_ARGS) && (card->eg_boundary) &&

	    (from % card->erase_size)) {

	rem = card->erase_size - (from % card->erase_size);

	if ((arg & MMC_TRIM_ARGS) && (card->eg_boundary) && (nr > rem)) {

		err = mmc_do_erase(card, from, from + rem - 1, arg);

		from += rem;

		if ((err) || (to <= from))