diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-05 13:24:11 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-05 13:24:11 +0200 |
| commit | 62cc20bcf25617dd5ad23356ea46830da3ef7356 (patch) | |
| tree | afc8bd217bd3227d26b4aebf3526723c28fe3a08 /drivers/crypto/vmx/aes_xts.c | |
| parent | a1eb1411b4e4251db02179e39d234c2ee5192c72 (diff) | |
| parent | 135e8c9250dd5c8c9aae5984fde6f230d0cbfeaf (diff) | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/crypto/vmx/aes_xts.c')
| -rw-r--r-- | drivers/crypto/vmx/aes_xts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/vmx/aes_xts.c b/drivers/crypto/vmx/aes_xts.c index cfb25413917c..24353ec336c5 100644 --- a/drivers/crypto/vmx/aes_xts.c +++ b/drivers/crypto/vmx/aes_xts.c @@ -129,8 +129,8 @@ static int p8_aes_xts_crypt(struct blkcipher_desc *desc, blkcipher_walk_init(&walk, dst, src, nbytes); - iv = (u8 *)walk.iv; ret = blkcipher_walk_virt(desc, &walk); + iv = walk.iv; memset(tweak, 0, AES_BLOCK_SIZE); aes_p8_encrypt(iv, tweak, &ctx->tweak_key); |