Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: smp_on_up: allow non-ARM SMP processors
  ARM: io: ensure inb/outb() et.al. are properly ordered on ARMv6+
  ARM: initrd: disable initrd if passed address overlaps reserved region
  ARM: footbridge: fix debug macros
  ARM: mmci: round down the bytes transferred on error
  ARM: mmci: complete the transaction on error
  ARM: 6642/1: mmci: calculate remaining bytes at error correctly

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 4b8dcd5b2a01..2d6de3e03e2d 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -14,6 +14,7 @@
 #include <linux/ioport.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
+#include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/highmem.h>
@@ -283,19 +284,19 @@ 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 = round_down(success - 1, data->blksz);
                         data->error = -EILSEQ;
                 } else if (status & MCI_DATATIMEOUT) {
-                        host->data_xfered = success;
+                        host->data_xfered = round_down(success, data->blksz);
                         data->error = -ETIMEDOUT;
                 } else if (status & (MCI_TXUNDERRUN|MCI_RXOVERRUN)) {
-                        host->data_xfered = success;
+                        host->data_xfered = round_down(success, data->blksz);
                         data->error = -EIO;
                 }
 
@@ -319,7 +320,7 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data,
         if (status & MCI_DATABLOCKEND)
                 dev_err(mmc_dev(host->mmc), "stray MCI_DATABLOCKEND interrupt\n");
 
-        if (status & MCI_DATAEND) {
+        if (status & MCI_DATAEND || data->error) {
                 mmci_stop_data(host);
 
                 if (!data->error)