From: Robin van der Gracht <robin@protonic.nl>
Date: Tue, 4 Aug 2015 06:58:33 +0000 (+0200)
Subject: mmc: core: Fixed bug in one erase-group budget TRIM
X-Git-Tag: v4.3-rc1~46^2~39
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=22d7e85ff8e5826845e9a4fa34b4723e5a97ee9b;p=users%2Fjedix%2Flinux-maple.git

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: Robin van der Gracht <robin@protonic.nl>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 083cade3ffc5..57edb2a9bb04 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -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);
+	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))