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;
 }