diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 02:01:14 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 02:01:14 -0400 |
| commit | cf9fe114e3b37e14fc8434d5abb192e35df551b1 (patch) | |
| tree | 0f82879295dc792f9df1a3ce79e143a3c073510f /crypto/ahash.c | |
| parent | c1d0d32a603ed06377f404adf2c538de33bb3634 (diff) | |
| parent | 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'crypto/ahash.c')
| -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 b2d1ee32cfe8..f3476374f764 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) | |||
| 82 | if (err) | 82 | if (err) |
| 83 | return err; | 83 | return err; |
| 84 | 84 | ||
| 85 | walk->offset = 0; | 85 | if (nbytes) { |
| 86 | 86 | walk->offset = 0; | |
| 87 | if (nbytes) | 87 | walk->pg++; |
| 88 | return hash_walk_next(walk); | 88 | return hash_walk_next(walk); |
| 89 | } | ||
| 89 | 90 | ||
| 90 | if (!walk->total) | 91 | if (!walk->total) |
| 91 | return 0; | 92 | return 0; |