Merge branch 'x86-process-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / crypto / async_tx / async_memcpy.c

diff --git a/crypto/async_tx/async_memcpy.c b/crypto/async_tx/async_memcpy.c
index b38cbb3fd527cd0712c4b7f44ba16a79dd33686c..0ec1fb69d4eacc2a310504caa9109186f9e89370 100644 (file)
--- a/crypto/async_tx/async_memcpy.c
+++ b/crypto/async_tx/async_memcpy.c
@@ -50,7 +50,7 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset,
        struct dma_device *device = chan ? chan->device : NULL;
        struct dma_async_tx_descriptor *tx = NULL;
 
-       if (device) {
+       if (device && is_dma_copy_aligned(device, src_offset, dest_offset, len)) {
                dma_addr_t dma_dest, dma_src;
                unsigned long dma_prep_flags = 0;