summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-07-05 19:52:04 +0300
committerPierre Ossman <drzeus@drzeus.cx>2008-07-15 14:14:49 +0200
commitc8b3e02eb250ceb661437e9b198757eff0eb6fd2 (patch)
treeaa11c6360e64d6f8eeb2b73fc92d7efb9d8111b1 /drivers/mmc
parent23af60398af2f5033e2f53665538a09f498dbc03 (diff)
downloadop-kernel-dev-c8b3e02eb250ceb661437e9b198757eff0eb6fd2.zip
op-kernel-dev-c8b3e02eb250ceb661437e9b198757eff0eb6fd2.tar.gz
mmc: fix spares errors of sdhci.c
1. sdhci_prepare_data: fix shadowing of count variable u8 count int count -> sg_cnt; 2. sdhci_add_host: assignment of integer to pointer dma_mask = 0 -> dma_mask = NULL; Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index d3e4a39..13bd681 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -672,14 +672,14 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)
host->ioaddr + SDHCI_ADMA_ADDRESS);
}
} else {
- int count;
+ int sg_cnt;
- count = dma_map_sg(mmc_dev(host->mmc),
+ sg_cnt = dma_map_sg(mmc_dev(host->mmc),
data->sg, data->sg_len,
(data->flags & MMC_DATA_READ) ?
DMA_FROM_DEVICE :
DMA_TO_DEVICE);
- if (count == 0) {
+ if (sg_cnt == 0) {
/*
* This only happens when someone fed
* us an invalid request.
@@ -1583,7 +1583,7 @@ int sdhci_add_host(struct sdhci_host *host)
/* XXX: Hack to get MMC layer to avoid highmem */
if (!(host->flags & SDHCI_USE_DMA))
- mmc_dev(host->mmc)->dma_mask = 0;
+ mmc_dev(host->mmc)->dma_mask = NULL;
host->max_clk =
(caps & SDHCI_CLOCK_BASE_MASK) >> SDHCI_CLOCK_BASE_SHIFT;
OpenPOWER on IntegriCloud