---

yaml --- r: 94951 b: refs/heads/master c: 26eed9a h: refs/heads/master i: 94949: 00165cc 94947: ee0fdbd 94943: cc98afc v: v3
git-mirror · Apr 28, 2008 · 923e69d · 923e69d
1 parent a3ea6d6
commit 923e69d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;