crypto: scatterwalk - Remove unnecessary advance in scatterwalk_pagedone

[cascardo/linux.git] / crypto / scatterwalk.c

diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index e124ce2..2ec5368 100644 (file)
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -62,17 +62,14 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,
                        flush_dcache_page(page);
        }
 
-       if (more) {
-               walk->offset += PAGE_SIZE - 1;
-               walk->offset &= PAGE_MASK;
-               if (walk->offset >= walk->sg->offset + walk->sg->length)
-                       scatterwalk_start(walk, sg_next(walk->sg));
-       }
+       if (more && walk->offset >= walk->sg->offset + walk->sg->length)
+               scatterwalk_start(walk, sg_next(walk->sg));
 }
 
 void scatterwalk_done(struct scatter_walk *walk, int out, int more)
 {
-       if (!(scatterwalk_pagelen(walk) & (PAGE_SIZE - 1)) || !more)
+       if (!more || walk->offset >= walk->sg->offset + walk->sg->length ||
+           !(walk->offset & (PAGE_SIZE - 1)))
                scatterwalk_pagedone(walk, out, more);
 }
 EXPORT_SYMBOL_GPL(scatterwalk_done);