From 923e69d0cf461298a56db56fb01a402748da51ff Mon Sep 17 00:00:00 2001
From: Linus Walleij <triad@df.lth.se>
Date: Sat, 26 Apr 2008 23:39:44 +0100
Subject: [PATCH] --- yaml --- r: 94951 b: refs/heads/master c:
 26eed9a5c61edd93d88e147188d4feae6770174e h: refs/heads/master i:   94949:
 00165cc1e8aacd2490b15bf1314a5294a907c1fd   94947:
 ee0fdbdb300d4013b1a015b2e9f3538b62d386dc   94943:
 cc98afc9f4448e4e2b8df10a41c62ac235e535b7 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/mmc/host/mmci.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 350f25ae0d4b..1b46198a1d66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 136eb955773dc99f82e6e754038eb1c530e03fdf
+refs/heads/master: 26eed9a5c61edd93d88e147188d4feae6770174e
diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c
index 95244a7e7353..626ac083f4e0 100644
--- a/trunk/drivers/mmc/host/mmci.c
+++ b/trunk/drivers/mmc/host/mmci.c
@@ -213,9 +213,10 @@ static int mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int rema
 	void __iomem *base = host->base;
 	char *ptr = buffer;
 	u32 status;
+	int host_remain = host->size;
 
 	do {
-		int count = host->size - (readl(base + MMCIFIFOCNT) << 2);
+		int count = host_remain - (readl(base + MMCIFIFOCNT) << 2);
 
 		if (count > remain)
 			count = remain;
@@ -227,6 +228,7 @@ static int mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int rema
 
 		ptr += count;
 		remain -= count;
+		host_remain -= count;
 
 		if (remain == 0)
 			break;