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,