---

yaml --- r: 127091 b: refs/heads/master c: bdc17a1 h: refs/heads/master i: 127089: a89c3aa 127087: 583e89c v: v3
git-mirror · Jan 7, 2009 · 062ea3b · 062ea3b
1 parent 9eebd90
commit 062ea3b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);