diff options
author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2010-05-16 19:40:56 -0300 |
---|---|---|
committer | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2010-05-16 19:40:56 -0300 |
commit | 1c93dc3bd2d1f3f22f021b036c647db1316a7083 (patch) | |
tree | 1678134117b42ea7af7d7b4c1f10e864d486ae25 /crypto/algapi.c | |
parent | 39fa904443d5fef09dfeb90b94ec9892a5a96a35 (diff) | |
parent | 30800d10f2872689cd78711f26b065494df8bb74 (diff) | |
download | linux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.tar.gz linux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.zip |
Merge mainline (v2.6.34-rc7)
Diffstat (limited to 'crypto/algapi.c')
-rw-r--r-- | crypto/algapi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c index f149b1c8..76fae27e 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -17,6 +17,7 @@ #include <linux/list.h> #include <linux/module.h> #include <linux/rtnetlink.h> +#include <linux/slab.h> #include <linux/string.h> #include "internal.h" @@ -230,7 +231,7 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg) list_add(&alg->cra_list, &crypto_alg_list); list_add(&larval->alg.cra_list, &crypto_alg_list); -out: +out: return larval; free_larval: @@ -388,7 +389,7 @@ int crypto_unregister_alg(struct crypto_alg *alg) { int ret; LIST_HEAD(list); - + down_write(&crypto_alg_sem); ret = crypto_remove_alg(alg, &list); up_write(&crypto_alg_sem); |