diff options
| author | Mike Frysinger <vapier.adi@gmail.com> | 2009-01-07 16:14:38 +0100 |
|---|---|---|
| committer | Bryan Wu <cooloney@kernel.org> | 2009-01-07 16:14:38 +0100 |
| commit | bdc17a1bf2bc4dfef0459dd71fb8d12d458f06a1 (patch) | |
| tree | 3d2bf2a799140897dfa33365c2e9b91e3cb28cbb /arch/blackfin | |
| parent | Blackfin arch: Add BF537-STAMP platform support for ENC28J60 SPI Ethernet MAC (diff) | |
| download | linux-bdc17a1bf2bc4dfef0459dd71fb8d12d458f06a1.tar.xz linux-bdc17a1bf2bc4dfef0459dd71fb8d12d458f06a1.zip | |
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/blackfin')
| -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) 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); |