lkml.org 
[lkml]   [2008]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/5] MMC: fix spares errors of sdhci.c
    Date
    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    ---
    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 6441e44..aa268e3 100644
    --- a/drivers/mmc/host/sdhci.c
    +++ b/drivers/mmc/host/sdhci.c
    @@ -386,12 +386,12 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)
    }

    if (host->flags & SDHCI_REQ_USE_DMA) {
    - int count;
    + int dma_cnt;

    - count = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
    + dma_cnt = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
    (data->flags & MMC_DATA_READ) ?
    DMA_FROM_DEVICE : DMA_TO_DEVICE);
    - WARN_ON(count != 1);
    + WARN_ON(dma_cnt != 1);

    writel(sg_dma_address(data->sg),
    host->ioaddr + SDHCI_DMA_ADDRESS);
    @@ -1224,7 +1224,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;
    --
    1.5.4.1
    ---------------------------------------------------------------------
    Intel Israel (74) Limited
    This e-mail and any attachments may contain confidential material for
    the sole use of the intended recipient(s). Any review or distribution
    by others is strictly prohibited. If you are not the intended
    recipient, please contact the sender and delete all copies.



    \
     
     \ /
      Last update: 2008-07-01 01:57    [W:0.022 / U:0.268 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site