ARM: 6642/1: mmci: calculate remaining bytes at error correctly

The MMCIDATACNT register contain the number of byte left at error
not the number of words, so loose the << 2 thing. Further if CRC
fails on the first block, we may end up with a negative number
of transferred bytes which is not good, and the formula was in
wrong order.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 4b8dcd5b2a01c4f3d778368a246d105b6ed3adb3..b6fd6dcb41e73adbb6a0f4e88cf528bcaf367499 100644 (file)
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -283,13 +283,13 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data,
                u32 remain, success;
 
                /* Calculate how far we are into the transfer */
-               remain = readl(host->base + MMCIDATACNT) << 2;
+               remain = readl(host->base + MMCIDATACNT);
                success = data->blksz * data->blocks - remain;
 
                dev_dbg(mmc_dev(host->mmc), "MCI ERROR IRQ (status %08x)\n", status);
                if (status & MCI_DATACRCFAIL) {
                        /* Last block was not successful */
-                       host->data_xfered = ((success / data->blksz) - 1 * data->blksz);
+                       host->data_xfered = ((success - 1) / data->blksz) * data->blksz;
                        data->error = -EILSEQ;
                } else if (status & MCI_DATATIMEOUT) {
                        host->data_xfered = success;