X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fbluetooth%2Faf_bluetooth.c;h=469eda0f0dfd713f0d998b5c830faaff2e9c71fd;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=788ea7a2b74498c10534501e62c3e91fd17c117e;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 788ea7a2b..469eda0f0 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -24,6 +24,7 @@
 
 /* Bluetooth address family and sockets. */
 
+#include <linux/config.h>
 #include <linux/module.h>
 
 #include <linux/types.h>
@@ -48,7 +49,7 @@
 #define BT_DBG(D...)
 #endif
 
-#define VERSION "2.10"
+#define VERSION "2.8"
 
 /* Bluetooth sockets */
 #define BT_MAX_PROTO	8
@@ -307,22 +308,14 @@ static struct net_proto_family bt_sock_family_ops = {
 
 static int __init bt_init(void)
 {
-	int err;
-
 	BT_INFO("Core ver %s", VERSION);
 
-	err = bt_sysfs_init();
-	if (err < 0)
-		return err;
-
-	err = sock_register(&bt_sock_family_ops);
-	if (err < 0) {
-		bt_sysfs_cleanup();
-		return err;
-	}
+	sock_register(&bt_sock_family_ops);
 
 	BT_INFO("HCI device and connection manager initialized");
 
+	bt_sysfs_init();
+
 	hci_sock_init();
 
 	return 0;
@@ -332,9 +325,9 @@ static void __exit bt_exit(void)
 {
 	hci_sock_cleanup();
 
-	sock_unregister(PF_BLUETOOTH);
-
 	bt_sysfs_cleanup();
+
+	sock_unregister(PF_BLUETOOTH);
 }
 
 subsys_initcall(bt_init);