]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sdhci: fix bad warning from commit c8b3e02
authorPierre Ossman <drzeus@drzeus.cx>
Tue, 22 Jul 2008 11:23:23 +0000 (13:23 +0200)
committerPierre Ossman <drzeus@drzeus.cx>
Wed, 23 Jul 2008 12:42:09 +0000 (14:42 +0200)
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>
drivers/mmc/host/sdhci.c

index b27c1a28a7cadb6ad2c9773bff96fe4728ac22d1..8b1f412144cfee13dae4e2065e632d6ff96df13d 100644 (file)
@@ -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);
                        }