From: Pierre Ossman <drzeus@drzeus.cx>
Date: Fri, 30 Jun 2006 09:22:34 +0000 (-0700)
Subject: [MMC] sdhci: remove duplicate error message
X-Git-Tag: v2.6.18-rc1~142^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4cca56c50427eecfa2428cdee722848cd82f443c;p=linux-2.6-omap-h63xx.git

[MMC] sdhci: remove duplicate error message

When there is remaining blocks untransferred, we get two error messages saying
almost the same thing.  Make sure at most one is shown.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 16ed2ae929d..60a40cb0a49 100644
--- a/drivers/mmc/sdhci.c
+++ b/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);