From 7167968d03b02653f0b1994360ecc0b550d47527 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 13 Aug 2012 02:50:43 +0000
Subject: [PATCH] --- yaml --- r: 321984 b: refs/heads/master c:
 f4f8720febf0d785a054fc09bde5e3ad09728a58 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/llc/af_llc.c      | 5 +++--
 trunk/net/llc/llc_station.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4d22a47f3226..66051c63acdf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6024935f5ff5f1646bce8404416318e5fd4a0c4a
+refs/heads/master: f4f8720febf0d785a054fc09bde5e3ad09728a58
diff --git a/trunk/net/llc/af_llc.c b/trunk/net/llc/af_llc.c
index f6fe4d400502..8c2919ca36f6 100644
--- a/trunk/net/llc/af_llc.c
+++ b/trunk/net/llc/af_llc.c
@@ -1206,7 +1206,7 @@ static int __init llc2_init(void)
 	rc = llc_proc_init();
 	if (rc != 0) {
 		printk(llc_proc_err_msg);
-		goto out_unregister_llc_proto;
+		goto out_station;
 	}
 	rc = llc_sysctl_init();
 	if (rc) {
@@ -1226,7 +1226,8 @@ static int __init llc2_init(void)
 	llc_sysctl_exit();
 out_proc:
 	llc_proc_exit();
-out_unregister_llc_proto:
+out_station:
+	llc_station_exit();
 	proto_unregister(&llc_proto);
 	goto out;
 }
diff --git a/trunk/net/llc/llc_station.c b/trunk/net/llc/llc_station.c
index 45ddbb93c5d0..bba5184fafd7 100644
--- a/trunk/net/llc/llc_station.c
+++ b/trunk/net/llc/llc_station.c
@@ -701,7 +701,7 @@ void __init llc_station_init(void)
 	llc_main_station.state		= LLC_STATION_STATE_UP;
 }
 
-void __exit llc_station_exit(void)
+void llc_station_exit(void)
 {
 	llc_set_station_handler(NULL);
 }