1 files changed, 57 insertions, 35 deletions

diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 53a43adf2e21..ee37ef0caee2 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -66,7 +66,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
 {
         struct btmrvl_adapter *adapter = priv->adapter;
         struct btmrvl_event *event;
-        u8 ret = 0;
+        int ret = 0;
 
         event = (struct btmrvl_event *) skb->data;
         if (event->ec != 0xff) {
@@ -112,8 +112,17 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
         case BT_CMD_MODULE_CFG_REQ:
                 if (priv->btmrvl_dev.sendcmdflag &&
                                 event->data[1] == MODULE_BRINGUP_REQ) {
-                        BT_DBG("EVENT:%s", (event->data[2]) ?
-                                "Bring-up failed" : "Bring-up succeed");
+                        BT_DBG("EVENT:%s",
+                                ((event->data[2] == MODULE_BROUGHT_UP) ||
+                                (event->data[2] == MODULE_ALREADY_UP)) ?
+                                "Bring-up succeed" : "Bring-up failed");
+
+                        if (event->length > 3)
+                                priv->btmrvl_dev.dev_type = event->data[3];
+                        else
+                                priv->btmrvl_dev.dev_type = HCI_BREDR;
+
+                        BT_DBG("dev_type: %d", priv->btmrvl_dev.dev_type);
                 } else if (priv->btmrvl_dev.sendcmdflag &&
                                 event->data[1] == MODULE_SHUTDOWN_REQ) {
                         BT_DBG("EVENT:%s", (event->data[2]) ?
@@ -522,47 +531,20 @@ static int btmrvl_service_main_thread(void *data)
         return 0;
 }
 
-struct btmrvl_private *btmrvl_add_card(void *card)
+int btmrvl_register_hdev(struct btmrvl_private *priv)
 {
         struct hci_dev *hdev = NULL;
-        struct btmrvl_private *priv;
         int ret;
 
-        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-        if (!priv) {
-                BT_ERR("Can not allocate priv");
-                goto err_priv;
-        }
-
-        priv->adapter = kzalloc(sizeof(*priv->adapter), GFP_KERNEL);
-        if (!priv->adapter) {
-                BT_ERR("Allocate buffer for btmrvl_adapter failed!");
-                goto err_adapter;
-        }
-
-        btmrvl_init_adapter(priv);
-
         hdev = hci_alloc_dev();
         if (!hdev) {
                 BT_ERR("Can not allocate HCI device");
                 goto err_hdev;
         }
 
-        BT_DBG("Starting kthread...");
-        priv->main_thread.priv = priv;
-        spin_lock_init(&priv->driver_lock);
-
-        init_waitqueue_head(&priv->main_thread.wait_q);
-        priv->main_thread.task = kthread_run(btmrvl_service_main_thread,
-                                &priv->main_thread, "btmrvl_main_service");
-
         priv->btmrvl_dev.hcidev = hdev;
-        priv->btmrvl_dev.card = card;
-
         hdev->driver_data = priv;
 
-        priv->btmrvl_dev.tx_dnld_rdy = true;
-
         hdev->bus = HCI_SDIO;
         hdev->open = btmrvl_open;
         hdev->close = btmrvl_close;
@@ -572,6 +554,10 @@ struct btmrvl_private *btmrvl_add_card(void *card)
         hdev->ioctl = btmrvl_ioctl;
         hdev->owner = THIS_MODULE;
 
+        btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ);
+
+        hdev->dev_type = priv->btmrvl_dev.dev_type;
+
         ret = hci_register_dev(hdev);
         if (ret < 0) {
                 BT_ERR("Can not register HCI device");
@@ -582,16 +568,52 @@ struct btmrvl_private *btmrvl_add_card(void *card)
         btmrvl_debugfs_init(hdev);
 #endif
 
-        return priv;
+        return 0;
 
 err_hci_register_dev:
-        /* Stop the thread servicing the interrupts */
-        kthread_stop(priv->main_thread.task);
-
         hci_free_dev(hdev);
 
 err_hdev:
+        /* Stop the thread servicing the interrupts */
+        kthread_stop(priv->main_thread.task);
+
         btmrvl_free_adapter(priv);
+        kfree(priv);
+
+        return -ENOMEM;
+}
+EXPORT_SYMBOL_GPL(btmrvl_register_hdev);
+
+struct btmrvl_private *btmrvl_add_card(void *card)
+{
+        struct btmrvl_private *priv;
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv) {
+                BT_ERR("Can not allocate priv");
+                goto err_priv;
+        }
+
+        priv->adapter = kzalloc(sizeof(*priv->adapter), GFP_KERNEL);
+        if (!priv->adapter) {
+                BT_ERR("Allocate buffer for btmrvl_adapter failed!");
+                goto err_adapter;
+        }
+
+        btmrvl_init_adapter(priv);
+
+        BT_DBG("Starting kthread...");
+        priv->main_thread.priv = priv;
+        spin_lock_init(&priv->driver_lock);
+
+        init_waitqueue_head(&priv->main_thread.wait_q);
+        priv->main_thread.task = kthread_run(btmrvl_service_main_thread,
+                                &priv->main_thread, "btmrvl_main_service");
+
+        priv->btmrvl_dev.card = card;
+        priv->btmrvl_dev.tx_dnld_rdy = true;
+
+        return priv;
 
 err_adapter:
         kfree(priv);