iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: fix spares errors of sdhci.c

Browse Source 
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>
This commit is contained in:
Tomas Winkler 2008-07-05 19:52:04 +03:00 committed by Pierre Ossman
parent 23af60398a
commit c8b3e02eb2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mmc/host/sdhci.c
View File

@ -672,14 +672,14 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)
host->ioaddr + SDHCI_ADMA_ADDRESS); host->ioaddr + SDHCI_ADMA_ADDRESS);
} }
} else { } 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->sg, data->sg_len,
(data->flags & MMC_DATA_READ) ? (data->flags & MMC_DATA_READ) ?
DMA_FROM_DEVICE : DMA_FROM_DEVICE :
DMA_TO_DEVICE); DMA_TO_DEVICE);
if (count == 0) { if (sg_cnt == 0) {
/* /*
* This only happens when someone fed * This only happens when someone fed
* us an invalid request. * 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 */ /* XXX: Hack to get MMC layer to avoid highmem */
if (!(host->flags & SDHCI_USE_DMA)) if (!(host->flags & SDHCI_USE_DMA))
mmc_dev(host->mmc)->dma_mask = 0; mmc_dev(host->mmc)->dma_mask = NULL;
host->max_clk = host->max_clk =
(caps & SDHCI_CLOCK_BASE_MASK) >> SDHCI_CLOCK_BASE_SHIFT; (caps & SDHCI_CLOCK_BASE_MASK) >> SDHCI_CLOCK_BASE_SHIFT;