Merge branch 'merge'

Conflicts:

	arch/powerpc/sysdev/fsl_soc.c

1 files changed, 6 insertions, 0 deletions

diff --git a/crypto/cts.c b/crypto/cts.c
index c4e70bfb4970..ccf9c5de3958 100644
--- a/crypto/cts.c
+++ b/crypto/cts.c
@@ -89,6 +89,9 @@ static int cts_cbc_encrypt(struct crypto_cts_ctx *ctx,
         if (lastn < 0)
                 return -EINVAL;
 
+        sg_init_table(sgsrc, 1);
+        sg_init_table(sgdst, 1);
+
         memset(s, 0, sizeof(s));
         scatterwalk_map_and_copy(s, src, offset, nbytes, 0);
 
@@ -172,6 +175,9 @@ static int cts_cbc_decrypt(struct crypto_cts_ctx *ctx,
         if (lastn < 0)
                 return -EINVAL;
 
+        sg_init_table(sgsrc, 1);
+        sg_init_table(sgdst, 1);
+
         scatterwalk_map_and_copy(s, src, offset, nbytes, 0);
 
         lcldesc.tfm = ctx->child;