Merge tag 'for-linus-20150422' of git://git.infradead.org/linux-mtd

[linux-2.6-block.git] / net / ipv6 / ah6.c

diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index a6727add26240e9980ce8da620a6e5bf5cddaf8d..ed7d4e3f9c108961fed9ae3144328cc797fed3f9 100644 (file)
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -681,7 +681,7 @@ static int ah6_init_state(struct xfrm_state *x)
                goto error;
 
        ahp = kzalloc(sizeof(*ahp), GFP_KERNEL);
-       if (ahp == NULL)
+       if (!ahp)
                return -ENOMEM;
 
        ahash = crypto_alloc_ahash(x->aalg->alg_name, 0, 0);