Blackfin arch: dma_memcpy() - do not return NULL when transferring a multiple of 65k

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c
index ad936843ecda943dbf3975b330043516660d7594..1882fd82879b8c4a4fb9eb9cce09c501177c2cd1 100644 (file)
--- 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);