From 062ea3b322436f1f0076a10e62bbb2f68f4c7b83 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier.adi@gmail.com>
Date: Wed, 7 Jan 2009 23:14:38 +0800
Subject: [PATCH] --- yaml --- r: 127091 b: refs/heads/master c:
 bdc17a1bf2bc4dfef0459dd71fb8d12d458f06a1 h: refs/heads/master i:   127089:
 a89c3aa9e43e0dd86def7fbcf7f237e5f568eaa0   127087:
 583e89c074aee23885ae5b2faa1f7c6bdfc12b1f v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/blackfin/kernel/bfin_dma_5xx.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e45865e7e62e..da38a64d4e3f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85a192e92dcb67552ee3fcdf2e36c11688b61955
+refs/heads/master: bdc17a1bf2bc4dfef0459dd71fb8d12d458f06a1
diff --git a/trunk/arch/blackfin/kernel/bfin_dma_5xx.c b/trunk/arch/blackfin/kernel/bfin_dma_5xx.c
index ad936843ecda..1882fd82879b 100644
--- a/trunk/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/trunk/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);