]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[MMC] sdhci: remove duplicate error message
authorPierre Ossman <drzeus@drzeus.cx>
Fri, 30 Jun 2006 09:22:34 +0000 (02:22 -0700)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 2 Jul 2006 17:02:02 +0000 (18:02 +0100)
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>
drivers/mmc/sdhci.c

index 16ed2ae929d32f4a7f5c35703c5e90ed2cc818a2..60a40cb0a49a2b9750f0454782c7b3d281d7a3ab 100644 (file)
@@ -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);