2 files changed, 21 insertions, 13 deletions

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 47129b1ee20b..395e8f6982f9 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -293,6 +293,7 @@ struct hci_dev {
         int (*open)(struct hci_dev *hdev);
         int (*close)(struct hci_dev *hdev);
         int (*flush)(struct hci_dev *hdev);
+        int (*setup)(struct hci_dev *hdev);
         int (*send)(struct sk_buff *skb);
         void (*notify)(struct hci_dev *hdev, unsigned int evt);
         int (*ioctl)(struct hci_dev *hdev, unsigned int cmd, unsigned long arg);
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 9567e32a1f0c..0f00b8bc279f 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1127,26 +1127,33 @@ int hci_dev_open(__u16 dev)
                 goto done;
         }
 
-        if (test_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks))
-                set_bit(HCI_RAW, &hdev->flags);
-
-        /* Treat all non BR/EDR controllers as raw devices if
-           enable_hs is not set */
-        if (hdev->dev_type != HCI_BREDR && !enable_hs)
-                set_bit(HCI_RAW, &hdev->flags);
-
         if (hdev->open(hdev)) {
                 ret = -EIO;
                 goto done;
         }
 
-        if (!test_bit(HCI_RAW, &hdev->flags)) {
-                atomic_set(&hdev->cmd_cnt, 1);
-                set_bit(HCI_INIT, &hdev->flags);
-                ret = __hci_init(hdev);
-                clear_bit(HCI_INIT, &hdev->flags);
+        atomic_set(&hdev->cmd_cnt, 1);
+        set_bit(HCI_INIT, &hdev->flags);
+
+        if (hdev->setup && test_bit(HCI_SETUP, &hdev->dev_flags))
+                ret = hdev->setup(hdev);
+
+        if (!ret) {
+                /* Treat all non BR/EDR controllers as raw devices if
+                 * enable_hs is not set.
+                 */
+                if (hdev->dev_type != HCI_BREDR && !enable_hs)
+                        set_bit(HCI_RAW, &hdev->flags);
+
+                if (test_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks))
+                        set_bit(HCI_RAW, &hdev->flags);
+
+                if (!test_bit(HCI_RAW, &hdev->flags))
+                        ret = __hci_init(hdev);
         }
 
+        clear_bit(HCI_INIT, &hdev->flags);
+
         if (!ret) {
                 hci_dev_hold(hdev);
                 set_bit(HCI_UP, &hdev->flags);