Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cca56c5 authored by Pierre Ossman's avatar Pierre Ossman Committed by Russell King
Browse files

[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: default avatarPierre Ossman <drzeus@drzeus.cx>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 98608076

drivers/mmc/sdhci.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -470,9 +470,7 @@ static void sdhci_finish_data(struct sdhci_host *host) 
			"though there were blocks left. Please report this "

			"though there were blocks left. Please report this "

			"to " BUGMAIL ".\n", mmc_hostname(host->mmc));

			"to " BUGMAIL ".\n", mmc_hostname(host->mmc));

		data->error = MMC_ERR_FAILED;

		data->error = MMC_ERR_FAILED;

	}

	} else if (host->size != 0) {



	if (host->size != 0) {

		printk(KERN_ERR "%s: %d bytes were left untransferred. "

		printk(KERN_ERR "%s: %d bytes were left untransferred. "

			"Please report this to " BUGMAIL ".\n",

			"Please report this to " BUGMAIL ".\n",

			mmc_hostname(host->mmc), host->size);

			mmc_hostname(host->mmc), host->size);