From 015ff41d220ae4539b9a1badd6fe83c1dcef405a Mon Sep 17 00:00:00 2001
From: Pierre Ossman <drzeus@drzeus.cx>
Date: Sun, 12 Aug 2007 13:13:24 +0200
Subject: [PATCH] --- yaml --- r: 64332 b: refs/heads/master c:
 2b061973404802fb87db93175b856ee0dfbe38e4 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5ac1dae698c4..9bf3ef876f43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be760a9de881d84994403bb93177bcb95319c4cb
+refs/heads/master: 2b061973404802fb87db93175b856ee0dfbe38e4
diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c
index f2bc87ac24f7..7181e867863e 100644
--- a/trunk/drivers/mmc/host/sdhci.c
+++ b/trunk/drivers/mmc/host/sdhci.c
@@ -477,8 +477,8 @@ static void sdhci_finish_data(struct sdhci_host *host)
 	/*
 	 * Controller doesn't count down when in single block mode.
 	 */
-	if ((data->blocks == 1) && (data->error == MMC_ERR_NONE))
-		blocks = 0;
+	if (data->blocks == 1)
+		blocks = (data->error == MMC_ERR_NONE) ? 0 : 1;
 	else
 		blocks = readw(host->ioaddr + SDHCI_BLOCK_COUNT);
 	data->bytes_xfered = data->blksz * (data->blocks - blocks);