diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-07-21 06:26:55 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-07-21 06:26:55 +0200 |
| commit | 51b259bb01fcfb372ae39332936055b18328946c (patch) | |
| tree | e0be652c70a772e7cc8a6ad6daa6d53e70a25d98 /drivers/crypto/ux500/hash | |
| parent | crypto: vmx - Fix aes_p8_xts_decrypt build failure (diff) | |
| parent | crypto: qat - make qat_asym_algs.o depend on asn1 headers (diff) | |
| download | linux-51b259bb01fcfb372ae39332936055b18328946c.tar.xz linux-51b259bb01fcfb372ae39332936055b18328946c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to resolve conflict in qat Makefile.
Diffstat (limited to 'drivers/crypto/ux500/hash')
| -rw-r--r-- | drivers/crypto/ux500/hash/hash_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c index 574e87c7f2b8..9acccad26928 100644 --- a/drivers/crypto/ux500/hash/hash_core.c +++ b/drivers/crypto/ux500/hash/hash_core.c @@ -781,7 +781,7 @@ static int hash_process_data(struct hash_device_data *device_data, &device_data->state); memmove(req_ctx->state.buffer, device_data->state.buffer, - HASH_BLOCK_SIZE / sizeof(u32)); + HASH_BLOCK_SIZE); if (ret) { dev_err(device_data->dev, "%s: hash_resume_state() failed!\n", @@ -832,7 +832,7 @@ static int hash_process_data(struct hash_device_data *device_data, memmove(device_data->state.buffer, req_ctx->state.buffer, - HASH_BLOCK_SIZE / sizeof(u32)); + HASH_BLOCK_SIZE); if (ret) { dev_err(device_data->dev, "%s: hash_save_state() failed!\n", __func__); |