Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs

[linux-2.6-omap-h63xx.git] / drivers / mmc / host / wbsd.c

diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c
index c2b61606c430634c2564bba97a00de008d189361..adda37952032af52335dcfbb69fb925bf16e5046 100644 (file)
--- a/drivers/mmc/host/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
@@ -1219,7 +1219,7 @@ static int __devinit wbsd_alloc_mmc(struct device *dev)
        mmc->f_min = 375000;
        mmc->f_max = 24000000;
        mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
-       mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_MULTIWRITE;
+       mmc->caps = MMC_CAP_4_BIT_DATA;
 
        spin_lock_init(&host->lock);
 
@@ -1420,7 +1420,7 @@ kfree:
 
        dma_unmap_single(mmc_dev(host->mmc), host->dma_addr,
                WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
-       host->dma_addr = (dma_addr_t)NULL;
+       host->dma_addr = 0;
 
        kfree(host->dma_buffer);
        host->dma_buffer = NULL;
@@ -1445,7 +1445,7 @@ static void wbsd_release_dma(struct wbsd_host *host)
 
        host->dma = -1;
        host->dma_buffer = NULL;
-       host->dma_addr = (dma_addr_t)NULL;
+       host->dma_addr = 0;
 }
 
 /*