diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-06 20:21:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-06 20:21:28 +0200 |
| commit | 7f32197e5e5fbb3b6681a3aae1e5a07aa4e5aaa8 (patch) | |
| tree | 1a98c5fc5f552825bbfec5fa0a7efa4f56a5bb1e /crypto | |
| parent | a0c6d753ff7f7d3cb3bb359b0d05886c206dfec9 (diff) | |
| parent | d243cdfcd57095cc58b4fa182417c147a1a138c3 (diff) | |
| download | linux-crypto-7f32197e5e5fbb3b6681a3aae1e5a07aa4e5aaa8.tar.gz linux-crypto-7f32197e5e5fbb3b6681a3aae1e5a07aa4e5aaa8.zip | |
Merge branch 'linus' into perfcounters/core
Merge reason: Pick up the latest fixes before the -v8 perfcounters
release.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/ahash.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c index b2d1ee32..f3476374 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -82,10 +82,11 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err) if (err) return err; - walk->offset = 0; - - if (nbytes) + if (nbytes) { + walk->offset = 0; + walk->pg++; return hash_walk_next(walk); + } if (!walk->total) return 0; |