Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / net / bluetooth / smp.c

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 4c1a16a..43faf2a 100644 (file)
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -3387,7 +3387,10 @@ int smp_register(struct hci_dev *hdev)
        if (!lmp_sc_capable(hdev)) {
                debugfs_create_file("force_bredr_smp", 0644, hdev->debugfs,
                                    hdev, &force_bredr_smp_fops);
-               return 0;
+
+               /* Flag can be already set here (due to power toggle) */
+               if (!hci_dev_test_flag(hdev, HCI_FORCE_BREDR_SMP))
+                       return 0;
        }
 
        if (WARN_ON(hdev->smp_bredr_data)) {