From: Mike Frysinger <vapier.adi@gmail.com>
Date: Wed, 7 Jan 2009 15:14:38 +0000 (+0800)
Subject: Blackfin arch: dma_memcpy() - do not return NULL when transferring a multiple of 65k
X-Git-Tag: v2.6.29-rc1~189^2~67
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=bdc17a1bf2bc4dfef0459dd71fb8d12d458f06a1;p=linux-2.6-omap-h63xx.git

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 ad936843ecd..1882fd82879 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);