2 files changed, 12 insertions, 3 deletions

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index c04197347c90..34c17a0645ce 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -933,10 +933,8 @@ static int __hci_init(struct hci_dev *hdev)
         if (lmp_bredr_capable(hdev))
                 hci_debugfs_create_bredr(hdev);
 
-        if (lmp_le_capable(hdev)) {
+        if (lmp_le_capable(hdev))
                 hci_debugfs_create_le(hdev);
-                smp_register(hdev);
-        }
 
         return 0;
 }
@@ -2133,6 +2131,8 @@ static void hci_power_off(struct work_struct *work)
         BT_DBG("%s", hdev->name);
 
         hci_dev_do_close(hdev);
+
+        smp_unregister(hdev);
 }
 
 static void hci_discov_off(struct work_struct *work)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index cae612658ba9..f5c4d2eed9a1 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -6232,6 +6232,15 @@ static void powered_complete(struct hci_dev *hdev, u8 status, u16 opcode)
 
         BT_DBG("status 0x%02x", status);
 
+        if (!status) {
+                /* Register the available SMP channels (BR/EDR and LE) only
+                 * when successfully powering on the controller. This late
+                 * registration is required so that LE SMP can clearly
+                 * decide if the public address or static address is used.
+                 */
+                smp_register(hdev);
+        }
+
         hci_dev_lock(hdev);
 
         mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match);