From c1ebc7856735247467bf2b96ce6a07df4bb2205f Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 7 Nov 2007 02:21:47 -0800
Subject: [PATCH] --- yaml --- r: 73278 b: refs/heads/master c:
 4999f3621f4da622e77931b3d33ada6c7083c705 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/ipv4/ipcomp.c  | 3 ++-
 trunk/net/ipv6/ipcomp6.c | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4c1d86a539c9..7beeb1544318 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fffe470a803e7f7b74c016291e542a0162761209
+refs/heads/master: 4999f3621f4da622e77931b3d33ada6c7083c705
diff --git a/trunk/net/ipv4/ipcomp.c b/trunk/net/ipv4/ipcomp.c
index ca1b5fdb8d31..2c44a94c2135 100644
--- a/trunk/net/ipv4/ipcomp.c
+++ b/trunk/net/ipv4/ipcomp.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <asm/semaphore.h>
 #include <linux/crypto.h>
+#include <linux/err.h>
 #include <linux/pfkeyv2.h>
 #include <linux/percpu.h>
 #include <linux/smp.h>
@@ -344,7 +345,7 @@ static struct crypto_comp **ipcomp_alloc_tfms(const char *alg_name)
 	for_each_possible_cpu(cpu) {
 		struct crypto_comp *tfm = crypto_alloc_comp(alg_name, 0,
 							    CRYPTO_ALG_ASYNC);
-		if (!tfm)
+		if (IS_ERR(tfm))
 			goto error;
 		*per_cpu_ptr(tfms, cpu) = tfm;
 	}
diff --git a/trunk/net/ipv6/ipcomp6.c b/trunk/net/ipv6/ipcomp6.c
index 85eb4798d8d2..0cd4056f9127 100644
--- a/trunk/net/ipv6/ipcomp6.c
+++ b/trunk/net/ipv6/ipcomp6.c
@@ -36,6 +36,7 @@
 #include <net/ipcomp.h>
 #include <asm/semaphore.h>
 #include <linux/crypto.h>
+#include <linux/err.h>
 #include <linux/pfkeyv2.h>
 #include <linux/random.h>
 #include <linux/percpu.h>
@@ -358,7 +359,7 @@ static struct crypto_comp **ipcomp6_alloc_tfms(const char *alg_name)
 	for_each_possible_cpu(cpu) {
 		struct crypto_comp *tfm = crypto_alloc_comp(alg_name, 0,
 							    CRYPTO_ALG_ASYNC);
-		if (!tfm)
+		if (IS_ERR(tfm))
 			goto error;
 		*per_cpu_ptr(tfms, cpu) = tfm;
 	}