From: Pierre Ossman <drzeus@drzeus.cx>
Date: Tue, 22 Jul 2008 11:23:23 +0000 (+0200)
Subject: sdhci: fix bad warning from commit c8b3e02
X-Git-Tag: v2.6.27-rc1~851^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=719a61b452ff74cf81a96e4212748d9d63bcc924;p=linux-2.6

sdhci: fix bad warning from commit c8b3e02

Commit c8b3e02 renamed a variable, but missed one reference to it
inside a WARN_ON, causing it to incorrectly trigger.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
---

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index b27c1a28a7..8b1f412144 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -689,7 +689,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)
 				WARN_ON(1);
 				host->flags &= ~SDHCI_USE_DMA;
 			} else {
-				WARN_ON(count != 1);
+				WARN_ON(sg_cnt != 1);
 				writel(sg_dma_address(data->sg),
 					host->ioaddr + SDHCI_DMA_ADDRESS);
 			}