Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 1 deletions

diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index 90d26c91f4e9..7a7219266e3c 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -89,9 +89,9 @@ static inline unsigned int blkcipher_done_fast(struct blkcipher_walk *walk,
                 memcpy(walk->dst.virt.addr, walk->page, n);
                 blkcipher_unmap_dst(walk);
         } else if (!(walk->flags & BLKCIPHER_WALK_PHYS)) {
-                blkcipher_unmap_src(walk);
                 if (walk->flags & BLKCIPHER_WALK_DIFF)
                         blkcipher_unmap_dst(walk);
+                blkcipher_unmap_src(walk);
         }
 
         scatterwalk_advance(&walk->in, n);