Merge branch 'master' into next

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)
         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;