diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-15 02:47:04 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-15 02:47:04 -0400 |
commit | d09f51b6997f3f443c5741bc696651e479576715 (patch) | |
tree | 6d5eefcbaa9f46d44e8cad626011e886b5d1840c /crypto/api.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/api.c')
-rw-r--r-- | crypto/api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/api.c b/crypto/api.c index 33734fd9198f..4ccc5af6c265 100644 --- a/crypto/api.c +++ b/crypto/api.c | |||
@@ -144,7 +144,7 @@ static void crypto_larval_kill(struct crypto_alg *alg) | |||
144 | down_write(&crypto_alg_sem); | 144 | down_write(&crypto_alg_sem); |
145 | list_del(&alg->cra_list); | 145 | list_del(&alg->cra_list); |
146 | up_write(&crypto_alg_sem); | 146 | up_write(&crypto_alg_sem); |
147 | complete(&larval->completion); | 147 | complete_all(&larval->completion); |
148 | crypto_alg_put(alg); | 148 | crypto_alg_put(alg); |
149 | } | 149 | } |
150 | 150 | ||