From e0bd8454f0eb41030dcbea337a00693368e7cb6f Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Wed, 29 Aug 2012 06:49:17 +0000
Subject: [PATCH] --- yaml --- r: 322447 b: refs/heads/master c:
 6fc09f10f12477bdaa54e94f9cb428bef6d81315 h: refs/heads/master i:   322445:
 2d826d6c531c7a9e2da32dc4486d663bd02b286e   322443:
 59f9d1276f7e1f2081226eb552d5791a23987bf8   322439:
 8bff252adc188833c7317e9c7d01a67a5679ab4a   322431:
 737755d7a0d2ef98be08f4888afb4960013ea2a0 v: v3

---
 [refs]                              | 2 +-
 trunk/net/netfilter/nfnetlink_log.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 58663d9c99ff..95e2b8f19667 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef6acf68c259d907517dcc0ffefcd4e30276ae29
+refs/heads/master: 6fc09f10f12477bdaa54e94f9cb428bef6d81315
diff --git a/trunk/net/netfilter/nfnetlink_log.c b/trunk/net/netfilter/nfnetlink_log.c
index 592091c1260b..14e2f3903142 100644
--- a/trunk/net/netfilter/nfnetlink_log.c
+++ b/trunk/net/netfilter/nfnetlink_log.c
@@ -996,8 +996,10 @@ static int __init nfnetlink_log_init(void)
 
 #ifdef CONFIG_PROC_FS
 	if (!proc_create("nfnetlink_log", 0440,
-			 proc_net_netfilter, &nful_file_ops))
+			 proc_net_netfilter, &nful_file_ops)) {
+		status = -ENOMEM;
 		goto cleanup_logger;
+	}
 #endif
 	return status;