From a27a40745c11a82c07c5800ad19b249043c3d100 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Sun, 22 Feb 2009 00:03:19 -0800
Subject: [PATCH] --- yaml --- r: 134655 b: refs/heads/master c:
 0117cfabe3ba9b430c6ff6eecd4fdc569977f24f h: refs/heads/master i:   134653:
 ffcb1e1fc63f734df6241aee9a2ba77a44d29700   134651:
 47ad112ad2156fa891e592c9487e48a625d5aa62   134647:
 97629a9f16117425bc11b3da711f8c8891010f52   134639:
 7ee58b957774b1dbe555530b6c3bd23a28433101   134623:
 9616619dbebd36e2b1757005ec48fa83113dc2ec   134591:
 b95124dec4a87086f3bb298424a893b780f29992   134527:
 145b96b7e652782ed82124ee282bbfb14e03c9e8   134399:
 feca9023d7a065e36e460f301c03ef18425283ba   134143:
 2deca3f9b4451835de73b0c06a5e5634ccb3e279 v: v3

---
 [refs]                | 2 +-
 trunk/net/802/psnap.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4b91682e9d89..1592916f2cff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01af4a0e3cce86212f6bf54ebe8f84d7219c862a
+refs/heads/master: 0117cfabe3ba9b430c6ff6eecd4fdc569977f24f
diff --git a/trunk/net/802/psnap.c b/trunk/net/802/psnap.c
index 6ed711748f26..bdbffa3cb043 100644
--- a/trunk/net/802/psnap.c
+++ b/trunk/net/802/psnap.c
@@ -95,15 +95,16 @@ static int snap_request(struct datalink_proto *dl,
 EXPORT_SYMBOL(register_snap_client);
 EXPORT_SYMBOL(unregister_snap_client);
 
-static char snap_err_msg[] __initdata =
+static const char snap_err_msg[] __initconst =
 	KERN_CRIT "SNAP - unable to register with 802.2\n";
 
 static int __init snap_init(void)
 {
 	snap_sap = llc_sap_open(0xAA, snap_rcv);
-
-	if (!snap_sap)
+	if (!snap_sap) {
 		printk(snap_err_msg);
+		return -EBUSY;
+	}
 
 	return 0;
 }