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 083cade3ffc5d1debd32da28ece75dc79c08f555..57edb2a9bb04bbf52daa9286e90d26ca1341d9b7 100644 (file)
--- 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))