Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge crypto tree to pick up crypto stats API revert.

3 files changed, 12 insertions, 6 deletions

diff --git a/crypto/cbc.c b/crypto/cbc.c
index b761b1f9c6ca..dd5f332fd566 100644
--- a/crypto/cbc.c
+++ b/crypto/cbc.c
@@ -140,9 +140,8 @@ static int crypto_cbc_create(struct crypto_template *tmpl, struct rtattr **tb)
         spawn = skcipher_instance_ctx(inst);
         err = crypto_init_spawn(spawn, alg, skcipher_crypto_instance(inst),
                                 CRYPTO_ALG_TYPE_MASK);
-        crypto_mod_put(alg);
         if (err)
-                goto err_free_inst;
+                goto err_put_alg;
 
         err = crypto_inst_setname(skcipher_crypto_instance(inst), "cbc", alg);
         if (err)
@@ -174,12 +173,15 @@ static int crypto_cbc_create(struct crypto_template *tmpl, struct rtattr **tb)
         err = skcipher_register_instance(tmpl, inst);
         if (err)
                 goto err_drop_spawn;
+        crypto_mod_put(alg);
 
 out:
         return err;
 
 err_drop_spawn:
         crypto_drop_spawn(spawn);
+err_put_alg:
+        crypto_mod_put(alg);
 err_free_inst:
         kfree(inst);
         goto out;
diff --git a/crypto/cfb.c b/crypto/cfb.c
index fd4e8500e121..e81e45673498 100644
--- a/crypto/cfb.c
+++ b/crypto/cfb.c
@@ -286,9 +286,8 @@ static int crypto_cfb_create(struct crypto_template *tmpl, struct rtattr **tb)
         spawn = skcipher_instance_ctx(inst);
         err = crypto_init_spawn(spawn, alg, skcipher_crypto_instance(inst),
                                 CRYPTO_ALG_TYPE_MASK);
-        crypto_mod_put(alg);
         if (err)
-                goto err_free_inst;
+                goto err_put_alg;
 
         err = crypto_inst_setname(skcipher_crypto_instance(inst), "cfb", alg);
         if (err)
@@ -317,12 +316,15 @@ static int crypto_cfb_create(struct crypto_template *tmpl, struct rtattr **tb)
         err = skcipher_register_instance(tmpl, inst);
         if (err)
                 goto err_drop_spawn;
+        crypto_mod_put(alg);
 
 out:
         return err;
 
 err_drop_spawn:
         crypto_drop_spawn(spawn);
+err_put_alg:
+        crypto_mod_put(alg);
 err_free_inst:
         kfree(inst);
         goto out;
diff --git a/crypto/pcbc.c b/crypto/pcbc.c
index ef802f6e9642..8aa10144407c 100644
--- a/crypto/pcbc.c
+++ b/crypto/pcbc.c
@@ -244,9 +244,8 @@ static int crypto_pcbc_create(struct crypto_template *tmpl, struct rtattr **tb)
         spawn = skcipher_instance_ctx(inst);
         err = crypto_init_spawn(spawn, alg, skcipher_crypto_instance(inst),
                                 CRYPTO_ALG_TYPE_MASK);
-        crypto_mod_put(alg);
         if (err)
-                goto err_free_inst;
+                goto err_put_alg;
 
         err = crypto_inst_setname(skcipher_crypto_instance(inst), "pcbc", alg);
         if (err)
@@ -275,12 +274,15 @@ static int crypto_pcbc_create(struct crypto_template *tmpl, struct rtattr **tb)
         err = skcipher_register_instance(tmpl, inst);
         if (err)
                 goto err_drop_spawn;
+        crypto_mod_put(alg);
 
 out:
         return err;
 
 err_drop_spawn:
         crypto_drop_spawn(spawn);
+err_put_alg:
+        crypto_mod_put(alg);
 err_free_inst:
         kfree(inst);
         goto out;