From 1f02dfd9ac1aedac303d66f00a01a0d75bd86e38 Mon Sep 17 00:00:00 2001
From: Andreas Westin <andreas.westin@stericsson.com>
Date: Thu, 10 May 2012 10:14:07 +0200
Subject: [PATCH] --- yaml --- r: 305903 b: refs/heads/master c:
 f7329e71626c977fee672710142eb34ed7d021c7 h: refs/heads/master i:   305901:
 5f55cf21d60d0eb82144d5a875a94a7c21efdc57   305899:
 528f9ae59e806df6e34e7af376fca635660e4e28   305895:
 2326b353702257ca25281d1839ed7cd66437ad8d   305887:
 a89f2b30f88e4cc483c288b1f8c4aecae1918fc4 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/crypto/ux500/cryp/cryp_core.c | 5 ++---
 trunk/drivers/crypto/ux500/hash/hash_core.c | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a7b9e918bb2d..28897f610aa7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 585d188f8072aa3722d5c1ec1f0f2ea82e474778
+refs/heads/master: f7329e71626c977fee672710142eb34ed7d021c7
diff --git a/trunk/drivers/crypto/ux500/cryp/cryp_core.c b/trunk/drivers/crypto/ux500/cryp/cryp_core.c
index 7051e000163b..7cac12793a4b 100644
--- a/trunk/drivers/crypto/ux500/cryp/cryp_core.c
+++ b/trunk/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;
diff --git a/trunk/drivers/crypto/ux500/hash/hash_core.c b/trunk/drivers/crypto/ux500/hash/hash_core.c
index cc6a371a2708..77f7508b6099 100644
--- a/trunk/drivers/crypto/ux500/hash/hash_core.c
+++ b/trunk/drivers/crypto/ux500/hash/hash_core.c
@@ -174,7 +174,7 @@ static int hash_set_dma_transfer(struct hash_ctx *ctx, struct scatterlist *sg,
 			"(TO_DEVICE)", __func__);
 	desc = channel->device->device_prep_slave_sg(channel,
 			ctx->device->dma.sg, ctx->device->dma.sg_len,
-			direction, DMA_CTRL_ACK | DMA_PREP_INTERRUPT);
+			direction, DMA_CTRL_ACK | DMA_PREP_INTERRUPT, NULL);
 	if (!desc) {
 		dev_err(ctx->device->dev,
 			"[%s]: device_prep_slave_sg() failed!", __func__);