From 595e6df30cf7e3cab58f70b06f07e7a85700eb7a Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <[andersk@ksplice.com]>
Date: Tue, 17 Aug 2010 11:00:03 +0000
Subject: [PATCH] --- yaml --- r: 213818 b: refs/heads/master c:
 f81380925209bc60732a57eef41ab440c056aacf h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/tipc/core.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3fe837074f3d..f8280016ac75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24763d80fbb45aaf477d53c2203c929f6c41b5fc
+refs/heads/master: f81380925209bc60732a57eef41ab440c056aacf
diff --git a/trunk/net/tipc/core.c b/trunk/net/tipc/core.c
index 696468117985..466b861dab91 100644
--- a/trunk/net/tipc/core.c
+++ b/trunk/net/tipc/core.c
@@ -169,6 +169,7 @@ void tipc_core_stop(void)
 	tipc_nametbl_stop();
 	tipc_ref_table_stop();
 	tipc_socket_stop();
+	tipc_log_resize(0);
 }
 
 /**
@@ -203,7 +204,9 @@ static int __init tipc_init(void)
 {
 	int res;
 
-	tipc_log_resize(CONFIG_TIPC_LOG);
+	if (tipc_log_resize(CONFIG_TIPC_LOG) != 0)
+		warn("Unable to create log buffer\n");
+
 	info("Activated (version " TIPC_MOD_VER
 	     " compiled " __DATE__ " " __TIME__ ")\n");
 
@@ -230,7 +233,6 @@ static void __exit tipc_exit(void)
 	tipc_core_stop_net();
 	tipc_core_stop();
 	info("Deactivated\n");
-	tipc_log_resize(0);
 }
 
 module_init(tipc_init);