OSDN Git Service

Bluetooth: hci_intel: Add Device configuration
authorLoic Poulain <loic.poulain@intel.com>
Fri, 4 Sep 2015 15:54:35 +0000 (17:54 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 17 Sep 2015 11:20:05 +0000 (13:20 +0200)
Apply DDC parameters once controller is in operational mode.

Signed-off-by: Loic Poulain <loic.poulain@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
drivers/bluetooth/hci_intel.c

index 215e8e9..b17386b 100644 (file)
@@ -737,6 +737,10 @@ static int intel_setup(struct hci_uart *hu)
 
        bt_dev_info(hdev, "Found device firmware: %s", fwname);
 
+       /* Save the DDC file name for later */
+       snprintf(fwname, sizeof(fwname), "intel/ibt-11-%u.ddc",
+                le16_to_cpu(params->dev_revid));
+
        kfree_skb(skb);
 
        if (fw->size < 644) {
@@ -929,6 +933,9 @@ done:
        set_bit(STATE_LPM_ENABLED, &intel->flags);
 
 no_lpm:
+       /* Ignore errors, device can work without DDC parameters */
+       btintel_load_ddc_config(hdev, fwname);
+
        skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL, HCI_CMD_TIMEOUT);
        if (IS_ERR(skb))
                return PTR_ERR(skb);