From 6f8648da5cecf1d8f24e3bcd807c5930900b7a1b Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Fri, 22 Mar 2013 01:28:18 +0000
Subject: [PATCH] --- yaml --- r: 362277 b: refs/heads/master c:
 558724a5b2a73ad0c7638e21e8dffc419d267b6c h: refs/heads/master i:   362275:
 074382d9c72e385e4087eb5ee6bb9f0970cb1141 v: v3

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

diff --git a/[refs] b/[refs]
index 66fbbf8cbfcc..ae7dc8b55a43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 130549fed828cc34c22624c6195afcf9e7ae56fe
+refs/heads/master: 558724a5b2a73ad0c7638e21e8dffc419d267b6c
diff --git a/trunk/net/netfilter/nfnetlink_queue_core.c b/trunk/net/netfilter/nfnetlink_queue_core.c
index 1cb48540f86a..42680b2baa11 100644
--- a/trunk/net/netfilter/nfnetlink_queue_core.c
+++ b/trunk/net/netfilter/nfnetlink_queue_core.c
@@ -1062,8 +1062,10 @@ static int __init nfnetlink_queue_init(void)
 
 #ifdef CONFIG_PROC_FS
 	if (!proc_create("nfnetlink_queue", 0440,
-			 proc_net_netfilter, &nfqnl_file_ops))
+			 proc_net_netfilter, &nfqnl_file_ops)) {
+		status = -ENOMEM;
 		goto cleanup_subsys;
+	}
 #endif
 
 	register_netdevice_notifier(&nfqnl_dev_notifier);