fs/fat: comment fix, fat_bits can be also 32

[linux-2.6-block.git] / crypto / algapi.c

diff --git a/crypto/algapi.c b/crypto/algapi.c
index f1d0307b1d083f3e374dbb2db4bce45a0f483948..d2627a3d4ed8b15cf53127b11daaad412a950711 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -64,6 +64,8 @@ static int crypto_check_alg(struct crypto_alg *alg)
        if (alg->cra_priority < 0)
                return -EINVAL;
 
+       atomic_set(&alg->cra_refcnt, 1);
+
        return crypto_set_driver_name(alg);
 }
 
@@ -187,7 +189,6 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg)
 
        ret = -EEXIST;
 
-       atomic_set(&alg->cra_refcnt, 1);
        list_for_each_entry(q, &crypto_alg_list, cra_list) {
                if (q == alg)
                        goto err;
@@ -522,11 +523,14 @@ int crypto_register_instance(struct crypto_template *tmpl,
 
        err = crypto_check_alg(&inst->alg);
        if (err)
-               goto err;
+               return err;
 
        inst->alg.cra_module = tmpl->module;
        inst->alg.cra_flags |= CRYPTO_ALG_INSTANCE;
 
+       if (unlikely(!crypto_mod_get(&inst->alg)))
+               return -EAGAIN;
+
        down_write(&crypto_alg_sem);
 
        larval = __crypto_register_alg(&inst->alg);
@@ -544,9 +548,14 @@ unlock:
                goto err;
 
        crypto_wait_for_test(larval);
+
+       /* Remove instance if test failed */
+       if (!(inst->alg.cra_flags & CRYPTO_ALG_TESTED))
+               crypto_unregister_instance(inst);
        err = 0;
 
 err:
+       crypto_mod_put(&inst->alg);
        return err;
 }
 EXPORT_SYMBOL_GPL(crypto_register_instance);