[Bluetooth] Add platform device for virtual and serial devices

This patch adds a generic Bluetooth platform device that can be used
as parent device by virtual and serial devices.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

1 files changed, 14 insertions, 6 deletions

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 729461fcfe99..788ea7a2b744 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -48,7 +48,7 @@
 #define BT_DBG(D...)
 #endif
 
-#define VERSION "2.9"
+#define VERSION "2.10"
 
 /* Bluetooth sockets */
 #define BT_MAX_PROTO    8
@@ -307,13 +307,21 @@ static struct net_proto_family bt_sock_family_ops = {
 
 static int __init bt_init(void)
 {
+        int err;
+
         BT_INFO("Core ver %s", VERSION);
 
-        sock_register(&bt_sock_family_ops);
+        err = bt_sysfs_init();
+        if (err < 0)
+                return err;
 
-        BT_INFO("HCI device and connection manager initialized");
+        err = sock_register(&bt_sock_family_ops);
+        if (err < 0) {
+                bt_sysfs_cleanup();
+                return err;
+        }
 
-        bt_sysfs_init();
+        BT_INFO("HCI device and connection manager initialized");
 
         hci_sock_init();
 
@@ -324,9 +332,9 @@ static void __exit bt_exit(void)
 {
         hci_sock_cleanup();
 
-        bt_sysfs_cleanup();
-
         sock_unregister(PF_BLUETOOTH);
+
+        bt_sysfs_cleanup();
 }
 
 subsys_initcall(bt_init);