diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-04 10:40:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-04 10:40:25 +0100 |
| commit | 888a8a3e9d79cbb9d83e53955f684998248580ec (patch) | |
| tree | 3dbf548438c77d89c8696a9a79c4129cdc2f3d3e /arch/s390/crypto | |
| parent | cfff2d909cbdaf8c467bd321aa0502a548ec8f7e (diff) | |
| parent | b06b3d49699a52e8f9ca056c4f96e81b1987d78e (diff) | |
| download | kernel_samsung_aries-888a8a3e9d79cbb9d83e53955f684998248580ec.zip kernel_samsung_aries-888a8a3e9d79cbb9d83e53955f684998248580ec.tar.gz kernel_samsung_aries-888a8a3e9d79cbb9d83e53955f684998248580ec.tar.bz2 | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Pick up updates before queueing up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/s390/crypto')
| -rw-r--r-- | arch/s390/crypto/sha_common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/crypto/sha_common.c b/arch/s390/crypto/sha_common.c index f42dbab..48884f8 100644 --- a/arch/s390/crypto/sha_common.c +++ b/arch/s390/crypto/sha_common.c @@ -38,6 +38,7 @@ int s390_sha_update(struct shash_desc *desc, const u8 *data, unsigned int len) BUG_ON(ret != bsize); data += bsize - index; len -= bsize - index; + index = 0; } /* process as many blocks as possible */ |