From 10a03951e80e0425a6dcf0651be557744d13c80d Mon Sep 17 00:00:00 2001
From: Pierre Ossman <drzeus@drzeus.cx>
Date: Fri, 30 Jun 2006 02:22:34 -0700
Subject: [PATCH] --- yaml --- r: 31739 b: refs/heads/master c:
 4cca56c50427eecfa2428cdee722848cd82f443c h: refs/heads/master i:   31737:
 136c5a88caedd67eaa312e00a43b73743185c5a0   31735:
 d7cfeb30c4f0daba31757fa9149052cbd46b77ad v: v3

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

diff --git a/[refs] b/[refs]
index 88a2a2993361..51bb38d62d6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98608076a21914ab12f1c858a0cdf55366260f12
+refs/heads/master: 4cca56c50427eecfa2428cdee722848cd82f443c
diff --git a/trunk/drivers/mmc/sdhci.c b/trunk/drivers/mmc/sdhci.c
index 16ed2ae929d3..60a40cb0a49a 100644
--- a/trunk/drivers/mmc/sdhci.c
+++ b/trunk/drivers/mmc/sdhci.c
@@ -470,9 +470,7 @@ static void sdhci_finish_data(struct sdhci_host *host)
 			"though there were blocks left. Please report this "
 			"to " BUGMAIL ".\n", mmc_hostname(host->mmc));
 		data->error = MMC_ERR_FAILED;
-	}
-
-	if (host->size != 0) {
+	} else if (host->size != 0) {
 		printk(KERN_ERR "%s: %d bytes were left untransferred. "
 			"Please report this to " BUGMAIL ".\n",
 			mmc_hostname(host->mmc), host->size);