diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2009-01-07 10:14:38 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2009-01-07 10:14:38 -0500 |
commit | bdc17a1bf2bc4dfef0459dd71fb8d12d458f06a1 (patch) | |
tree | 3d2bf2a799140897dfa33365c2e9b91e3cb28cbb /arch | |
parent | 85a192e92dcb67552ee3fcdf2e36c11688b61955 (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/blackfin/kernel/bfin_dma_5xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c index ad936843ecda..1882fd82879b 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) | |||
597 | rest = size - bulk; | 597 | rest = size - bulk; |
598 | if (bulk) | 598 | if (bulk) |
599 | __dma_memcpy(dest, src, bulk); | 599 | __dma_memcpy(dest, src, bulk); |
600 | addr = __dma_memcpy(dest+bulk, src+bulk, rest); | 600 | __dma_memcpy(dest+bulk, src+bulk, rest); |
601 | return addr; | 601 | return dest; |
602 | } | 602 | } |
603 | EXPORT_SYMBOL(dma_memcpy); | 603 | EXPORT_SYMBOL(dma_memcpy); |
604 | 604 | ||