summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2006-06-30 02:22:34 -0700
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-07-02 18:02:02 +0100
commit4cca56c50427eecfa2428cdee722848cd82f443c (patch)
tree712c56aaf853550628a6fee7a3f4694f5dadeb8b /drivers/mmc
parent98608076a21914ab12f1c858a0cdf55366260f12 (diff)
downloadop-kernel-dev-4cca56c50427eecfa2428cdee722848cd82f443c.zip
op-kernel-dev-4cca56c50427eecfa2428cdee722848cd82f443c.tar.gz
[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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/sdhci.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 16ed2ae..60a40cb 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);
OpenPOWER on IntegriCloud