summaryrefslogtreecommitdiff
path: root/crypto/ahash.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2010-05-03 11:28:58 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2010-05-03 11:28:58 +0800
commitfa09798e8294e18c391c7aa2586977bb6262957e (patch)
tree6138c7cddf9c5e664f157eb1bfaec03988198ed6 /crypto/ahash.c
parenta8f23ef06f619971e6a949ed7d4037820dbd4517 (diff)
parent9fb5d8ad81e452c5229dc9405dd2dbd08c96c74b (diff)
downloadlinux-crypto-fa09798e8294e18c391c7aa2586977bb6262957e.tar.gz
linux-crypto-fa09798e8294e18c391c7aa2586977bb6262957e.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'crypto/ahash.c')
-rw-r--r--crypto/ahash.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c
index 33a4ff45..b8c59b88 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -78,7 +78,6 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err)
walk->data -= walk->offset;
if (nbytes && walk->offset & alignmask && !err) {
- walk->offset += alignmask - 1;
walk->offset = ALIGN(walk->offset, alignmask + 1);
walk->data += walk->offset;