From dcbd43b370730b21e98f4b740706599595707a51 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Sun, 6 Jul 2008 00:51:07 +0200 Subject: [PATCH] --- yaml --- r: 102211 b: refs/heads/master c: 97067d5581ec831a75a45a52e417bee0f7943dbf h: refs/heads/master i: 102209: d0a0ef006b54bb42463c2caa9336e206660bdf6c 102207: 388455551041bdf8d79e9db7076fc39cb9acdfdc v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/wbsd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a95951300129..8bffcb8eacff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d2be0749a59096a334c94dc48f43294193cb8ed +refs/heads/master: 97067d5581ec831a75a45a52e417bee0f7943dbf diff --git a/trunk/drivers/mmc/host/wbsd.c b/trunk/drivers/mmc/host/wbsd.c index c2b61606c430..f7dcd8ec0d7f 100644 --- a/trunk/drivers/mmc/host/wbsd.c +++ b/trunk/drivers/mmc/host/wbsd.c @@ -1420,7 +1420,7 @@ static void __devinit wbsd_request_dma(struct wbsd_host *host, int dma) 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; } /*