From 9c65a4456bf6aa2815332ecaf7c0a2bc53879da2 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 30 Jan 2011 21:06:53 +0000 Subject: [PATCH] --- yaml --- r: 232679 b: refs/heads/master c: 613b152c63e35095a929f9bb80441cbe91ff5e80 h: refs/heads/master i: 232677: c3836b46fcd19816db8c3c82921af1715ff4a7f6 232675: 08d6eee19e277ecc3cdef47f82de6c2b22c2478c 232671: a0477103f054b391e95218514361ca65e1ad5fa3 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/mmci.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a4eef80c4bda..495eace37ef1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ccff9b51825b7335889b780bdf7de84ca803e291 +refs/heads/master: 613b152c63e35095a929f9bb80441cbe91ff5e80 diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c index 175a623a6a29..2d6de3e03e2d 100644 --- a/trunk/drivers/mmc/host/mmci.c +++ b/trunk/drivers/mmc/host/mmci.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -289,13 +290,13 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data, 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 - 1) / data->blksz) * 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; }