Merge git://github.com/herbertx/crypto

* git://github.com/herbertx/crypto:
  crypto: mv_cesa - fix hashing of chunks > 1920 bytes

diff --combined drivers/crypto/mv_cesa.c
index 5c6f56f,38a3297..dcd8bab
--- 1/drivers/crypto/mv_cesa.c
--- 2/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@@ -15,7 -15,6 +15,7 @@@
  #include <linux/platform_device.h>
  #include <linux/scatterlist.h>
  #include <linux/slab.h>
 +#include <linux/module.h>
  #include <crypto/internal/hash.h>
  #include <crypto/sha.h>
  
@@@ -343,11 -342,13 +343,13 @@@ static void mv_process_hash_current(in
                else
                        op.config |= CFG_MID_FRAG;
  
-               writel(req_ctx->state[0], cpg->reg + DIGEST_INITIAL_VAL_A);
-               writel(req_ctx->state[1], cpg->reg + DIGEST_INITIAL_VAL_B);
-               writel(req_ctx->state[2], cpg->reg + DIGEST_INITIAL_VAL_C);
-               writel(req_ctx->state[3], cpg->reg + DIGEST_INITIAL_VAL_D);
-               writel(req_ctx->state[4], cpg->reg + DIGEST_INITIAL_VAL_E);
+               if (first_block) {
+                       writel(req_ctx->state[0], cpg->reg + DIGEST_INITIAL_VAL_A);
+                       writel(req_ctx->state[1], cpg->reg + DIGEST_INITIAL_VAL_B);
+                       writel(req_ctx->state[2], cpg->reg + DIGEST_INITIAL_VAL_C);
+                       writel(req_ctx->state[3], cpg->reg + DIGEST_INITIAL_VAL_D);
+                       writel(req_ctx->state[4], cpg->reg + DIGEST_INITIAL_VAL_E);
+               }
        }
  
        memcpy(cpg->sram + SRAM_CONFIG, &op, sizeof(struct sec_accel_config));