From bdc17a1bf2bc4dfef0459dd71fb8d12d458f06a1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 7 Jan 2009 23:14:38 +0800 Subject: Blackfin arch: dma_memcpy() - do not return NULL when transferring a multiple of 65k Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu --- arch/blackfin/kernel/bfin_dma_5xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/blackfin/kernel') diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c index ad93684..1882fd8 100644 --- a/arch/blackfin/kernel/bfin_dma_5xx.c +++ b/arch/blackfin/kernel/bfin_dma_5xx.c @@ -597,8 +597,8 @@ void *dma_memcpy(void *dest, const void *src, size_t size) rest = size - bulk; if (bulk) __dma_memcpy(dest, src, bulk); - addr = __dma_memcpy(dest+bulk, src+bulk, rest); - return addr; + __dma_memcpy(dest+bulk, src+bulk, rest); + return dest; } EXPORT_SYMBOL(dma_memcpy); -- cgit v1.1