crypto: blkcipher - Fix WARN_ON handling in walk_done

[linux-2.6-omap-h63xx.git] / crypto / blkcipher.c

diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index 185f955fb0d7f79770b7765660bd1a9cbbcfab2e..d70a41c002df192e49f77871cd0837732fbad861 100644 (file)
--- 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)
@@ -696,34 +696,5 @@ void skcipher_geniv_exit(struct crypto_tfm *tfm)
 }
 EXPORT_SYMBOL_GPL(skcipher_geniv_exit);
 
-static int __init blkcipher_module_init(void)
-{
-       int err;
-
-       err = chainiv_module_init();
-       if (err)
-               goto out;
-
-       err = eseqiv_module_init();
-       if (err)
-               goto eseqiv_err;
-
-out:
-       return err;
-
-eseqiv_err:
-       chainiv_module_exit();
-       goto out;
-}
-
-static void __exit blkcipher_module_exit(void)
-{
-       eseqiv_module_exit();
-       chainiv_module_exit();
-}
-
-module_init(blkcipher_module_init);
-module_exit(blkcipher_module_exit);
-
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Generic block chaining cipher type");