aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 d3e4a391e351..13bd681eda29 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;