Merge branch 'topic/quirk-cleanup' into topic/hda

1 files changed, 1 insertions, 1 deletions

diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index 4a7e65c4df4d..d70a41c002df 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -124,6 +124,7 @@ int blkcipher_walk_done(struct blkcipher_desc *desc,
         scatterwalk_done(&walk->in, 0, nbytes);
         scatterwalk_done(&walk->out, 1, nbytes);
 
+err:
         walk->total = nbytes;
         walk->nbytes = nbytes;
 
@@ -132,7 +133,6 @@ int blkcipher_walk_done(struct blkcipher_desc *desc,
                 return blkcipher_walk_next(desc, walk);
         }
 
-err:
         if (walk->iv != desc->info)
                 memcpy(desc->info, walk->iv, crypto_blkcipher_ivsize(tfm));
         if (walk->buffer != walk->page)