Merge branch 'topic/asoc' into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / bluetooth / btmrvl_main.c

diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index ec48bfe9e279a46acd24e140eda8ef6ac394a465..ee37ef0caee269c0383fd9336ea9cf0d665ddba0 100644 (file)
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -116,6 +116,13 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
                                ((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]) ?
@@ -549,6 +556,8 @@ int btmrvl_register_hdev(struct btmrvl_private *priv)
 
        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");