From c017c8fe980e5c890ff30ad07d9290a14c324722 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sat, 17 Nov 2007 22:09:38 +0800
Subject: [PATCH] --- yaml --- r: 74185 b: refs/heads/master c:
 38cb2419f544ad413c7f7aa8c17fd7377610cdd8 h: refs/heads/master i:   74183:
 f3d9553ea055ca3dbd04a0145ee5270ba2a6e7d3 v: v3

---
 [refs]                | 2 +-
 trunk/crypto/algapi.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 29daf00fc37f..07fc591ded3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f347c4facfee3d11eb9cd1c070ab471a8fb7401e
+refs/heads/master: 38cb2419f544ad413c7f7aa8c17fd7377610cdd8
diff --git a/trunk/crypto/algapi.c b/trunk/crypto/algapi.c
index 8ff8c2656d9c..8383282de1dd 100644
--- a/trunk/crypto/algapi.c
+++ b/trunk/crypto/algapi.c
@@ -95,6 +95,9 @@ static void crypto_remove_spawn(struct crypto_spawn *spawn,
 		return;
 
 	inst->alg.cra_flags |= CRYPTO_ALG_DEAD;
+	if (hlist_unhashed(&inst->list))
+		return;
+
 	if (!tmpl || !crypto_tmpl_get(tmpl))
 		return;
 
@@ -335,9 +338,6 @@ int crypto_register_instance(struct crypto_template *tmpl,
 	LIST_HEAD(list);
 	int err = -EINVAL;
 
-	if (inst->alg.cra_destroy)
-		goto err;
-
 	err = crypto_check_alg(&inst->alg);
 	if (err)
 		goto err;