summaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorRomain Perier <romain.perier@free-electrons.com>2016-07-18 11:32:24 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2016-07-19 15:42:40 +0800
commitaa6416ee4676e5c235d4c7315340c24457e39430 (patch)
tree38b2f7e23302f1cf7e37725280a8196b96cb6894 /drivers/crypto
parente514cc0a492a3f39ef71b31590a7ef67537ee04b (diff)
downloadlinux-stable-aa6416ee4676e5c235d4c7315340c24457e39430.tar.gz
linux-stable-aa6416ee4676e5c235d4c7315340c24457e39430.tar.bz2
linux-stable-aa6416ee4676e5c235d4c7315340c24457e39430.zip
crypto: marvell - Fix wrong flag used for GFP in mv_cesa_dma_add_iv_op
Use the parameter 'gfp_flags' instead of 'flag' as second argument of dma_pool_alloc(). The parameter 'flag' is for the TDMA descriptor, its content has no sense for the allocator. Fixes: bac8e805a30d ("crypto: marvell - Copy IV vectors by DMA...") Signed-off-by: Romain Perier <romain.perier@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/marvell/tdma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/marvell/tdma.c b/drivers/crypto/marvell/tdma.c
index b0f9f5050dc8..86a065bcc187 100644
--- a/drivers/crypto/marvell/tdma.c
+++ b/drivers/crypto/marvell/tdma.c
@@ -221,7 +221,7 @@ int mv_cesa_dma_add_iv_op(struct mv_cesa_tdma_chain *chain, dma_addr_t src,
if (IS_ERR(tdma))
return PTR_ERR(tdma);
- iv = dma_pool_alloc(cesa_dev->dma->iv_pool, flags, &dma_handle);
+ iv = dma_pool_alloc(cesa_dev->dma->iv_pool, gfp_flags, &dma_handle);
if (!iv)
return -ENOMEM;