aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sdhci.c
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2008-07-22 07:23:23 -0400
committerPierre Ossman <drzeus@drzeus.cx>2008-07-23 08:42:09 -0400
commit719a61b452ff74cf81a96e4212748d9d63bcc924 (patch)
tree7196aaf30ad4ea8448d5b7cf9c9a2d32bbb10048 /drivers/mmc/host/sdhci.c
parent6cefd05f35177ad5d22d44519c680cf43f2ac86d (diff)
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>
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
-rw-r--r--drivers/mmc/host/sdhci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index b27c1a28a7ca..8b1f412144cf 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)
689 WARN_ON(1); 689 WARN_ON(1);
690 host->flags &= ~SDHCI_USE_DMA; 690 host->flags &= ~SDHCI_USE_DMA;
691 } else { 691 } else {
692 WARN_ON(count != 1); 692 WARN_ON(sg_cnt != 1);
693 writel(sg_dma_address(data->sg), 693 writel(sg_dma_address(data->sg),
694 host->ioaddr + SDHCI_DMA_ADDRESS); 694 host->ioaddr + SDHCI_DMA_ADDRESS);
695 } 695 }