From ead2abada0b5654287fb4f2eeb424aa428769d16 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Wed, 30 Apr 2008 00:27:14 +0800
Subject: [PATCH] --- yaml --- r: 95711 b: refs/heads/master c:
 b1145ce395f7785487c128fe8faf8624e6586d84 h: refs/heads/master i:   95709:
 1433df4316395a9772858ff46f95737fe4f0aaae   95707:
 9e492ac8e787289bc7e408c4851d2cc6d403d7be   95703:
 c2960ee4dd72cbd4a13ea91e11d8260d64af8189   95695:
 912e05411344afda3c1411c0ee6e99d462e4ff89   95679:
 7c9bc77c146d6b516e1389b16c3b5bb8ef0fa364 v: v3

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

diff --git a/[refs] b/[refs]
index a441e0b5acd1..ccb80a2bcc89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46f8153cc59384eb09a426d044668d4801f818ce
+refs/heads/master: b1145ce395f7785487c128fe8faf8624e6586d84
diff --git a/trunk/crypto/cryptd.c b/trunk/crypto/cryptd.c
index 250425263e00..b150de562057 100644
--- a/trunk/crypto/cryptd.c
+++ b/trunk/crypto/cryptd.c
@@ -190,8 +190,10 @@ static struct crypto_instance *cryptd_alloc_instance(struct crypto_alg *alg,
 	int err;
 
 	inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
-	if (IS_ERR(inst))
+	if (!inst) {
+		inst = ERR_PTR(-ENOMEM);
 		goto out;
+	}
 
 	err = -ENAMETOOLONG;
 	if (snprintf(inst->alg.cra_driver_name, CRYPTO_MAX_ALG_NAME,