diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-14 23:47:04 -0700 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-14 23:47:04 -0700 |
commit | d09f51b6997f3f443c5741bc696651e479576715 (patch) | |
tree | 6d5eefcbaa9f46d44e8cad626011e886b5d1840c /crypto/algapi.c | |
parent | 1b1ac759d7c6bba6e5f4731ef6ea720b6636e27c (diff) | |
parent | e559e91cce3af215d78b7262360f19b95978aab3 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
Conflicts:
crypto/Kconfig
Diffstat (limited to 'crypto/algapi.c')
-rw-r--r-- | crypto/algapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c index f137a432061..38aa9e99470 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -34,7 +34,7 @@ void crypto_larval_error(const char *name, u32 type, u32 mask) if (alg) { if (crypto_is_larval(alg)) { struct crypto_larval *larval = (void *)alg; - complete(&larval->completion); + complete_all(&larval->completion); } crypto_mod_put(alg); } @@ -164,7 +164,7 @@ static int __crypto_register_alg(struct crypto_alg *alg, continue; larval->adult = alg; - complete(&larval->completion); + complete_all(&larval->completion); continue; } |