From f7329e71626c977fee672710142eb34ed7d021c7 Mon Sep 17 00:00:00 2001 From: Andreas Westin Date: Thu, 10 May 2012 10:14:07 +0200 Subject: crypto: ux500 - Update DMA handling for 3.4 An update to the DMA framework added a new parameter to the device_prep_slave_sg call. Signed-off-by: Andreas Westin Acked-by: Arnd Bergmann Acked-by: Linus Walleij Signed-off-by: Herbert Xu --- drivers/crypto/ux500/cryp/cryp_core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'drivers/crypto/ux500/cryp') diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c index 7051e000163b..7cac12793a4b 100644 --- a/drivers/crypto/ux500/cryp/cryp_core.c +++ b/drivers/crypto/ux500/cryp/cryp_core.c @@ -542,8 +542,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx, desc = channel->device->device_prep_slave_sg(channel, ctx->device->dma.sg_src, ctx->device->dma.sg_src_len, - direction, - DMA_CTRL_ACK); + direction, DMA_CTRL_ACK, NULL); break; case DMA_FROM_DEVICE: @@ -569,7 +568,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx, ctx->device->dma.sg_dst_len, direction, DMA_CTRL_ACK | - DMA_PREP_INTERRUPT); + DMA_PREP_INTERRUPT, NULL); desc->callback = cryp_dma_out_callback; desc->callback_param = ctx; -- cgit