diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-07-05 12:52:04 -0400 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-07-15 08:14:49 -0400 |
commit | c8b3e02eb250ceb661437e9b198757eff0eb6fd2 (patch) | |
tree | aa11c6360e64d6f8eeb2b73fc92d7efb9d8111b1 /drivers/mmc/host/sdhci.c | |
parent | 23af60398af2f5033e2f53665538a09f498dbc03 (diff) |
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/host/sdhci.c')
-rw-r--r-- | drivers/mmc/host/sdhci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index d3e4a391e35..13bd681eda2 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) | |||
672 | host->ioaddr + SDHCI_ADMA_ADDRESS); | 672 | host->ioaddr + SDHCI_ADMA_ADDRESS); |
673 | } | 673 | } |
674 | } else { | 674 | } else { |
675 | int count; | 675 | int sg_cnt; |
676 | 676 | ||
677 | count = dma_map_sg(mmc_dev(host->mmc), | 677 | sg_cnt = dma_map_sg(mmc_dev(host->mmc), |
678 | data->sg, data->sg_len, | 678 | data->sg, data->sg_len, |
679 | (data->flags & MMC_DATA_READ) ? | 679 | (data->flags & MMC_DATA_READ) ? |
680 | DMA_FROM_DEVICE : | 680 | DMA_FROM_DEVICE : |
681 | DMA_TO_DEVICE); | 681 | DMA_TO_DEVICE); |
682 | if (count == 0) { | 682 | if (sg_cnt == 0) { |
683 | /* | 683 | /* |
684 | * This only happens when someone fed | 684 | * This only happens when someone fed |
685 | * us an invalid request. | 685 | * us an invalid request. |
@@ -1583,7 +1583,7 @@ int sdhci_add_host(struct sdhci_host *host) | |||
1583 | 1583 | ||
1584 | /* XXX: Hack to get MMC layer to avoid highmem */ | 1584 | /* XXX: Hack to get MMC layer to avoid highmem */ |
1585 | if (!(host->flags & SDHCI_USE_DMA)) | 1585 | if (!(host->flags & SDHCI_USE_DMA)) |
1586 | mmc_dev(host->mmc)->dma_mask = 0; | 1586 | mmc_dev(host->mmc)->dma_mask = NULL; |
1587 | 1587 | ||
1588 | host->max_clk = | 1588 | host->max_clk = |
1589 | (caps & SDHCI_CLOCK_BASE_MASK) >> SDHCI_CLOCK_BASE_SHIFT; | 1589 | (caps & SDHCI_CLOCK_BASE_MASK) >> SDHCI_CLOCK_BASE_SHIFT; |