Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[firefly-linux-kernel-4.4.55.git] / crypto / ahash.c

diff --git a/crypto/ahash.c b/crypto/ahash.c
index f6a36a52d738b44251deaeaa2dd18ebee39da421..8acb886032ae7a604fe0e965eb5d3ce07dd4845b 100644 (file)
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -55,6 +55,7 @@ static int hash_walk_next(struct crypto_hash_walk *walk)
 
        if (offset & alignmask) {
                unsigned int unaligned = alignmask + 1 - (offset & alignmask);
+
                if (nbytes > unaligned)
                        nbytes = unaligned;
        }
@@ -120,7 +121,7 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err)
        if (!walk->total)
                return 0;
 
-       walk->sg = scatterwalk_sg_next(walk->sg);
+       walk->sg = sg_next(walk->sg);
 
        return hash_walk_new_entry(walk);
 }