Skip to contentSkip to conversation

Bluetooth: btintel: Set quirk for non-persistent diagnostic settings

PATCH In review Marcel Holtmann 1 participant 1 message Oct 17, 2015 Bluetooth drivers

lore
Share & tools
lore

Marcel Holtmann

author maintainer
#0 lore raw

PATCH v2 2/3 Bluetooth: btintel: Set quirk for non-persistent diagnostic settings

For Intel controllers the diagnostics settings are not persistent over HCI Reset. So set the quirk to programm them again on every power up.

---
 drivers/bluetooth/btintel.c | 5 ++---
 drivers/bluetooth/btusb.c   | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/bluetooth/btintel.c +2 -3
index 95652aa12454..8d4891725e3b 100644
@@ -97,9 +97,6 @@ int btintel_set_diag(struct hci_dev *hdev, bool enable)
 	u8 param[3];
 	int err;
 
-	if (!test_bit(HCI_RUNNING, &hdev->flags))
-		return -ENETDOWN;
-
 	if (enable) {
 		param[0] = 0x03;
 		param[1] = 0x03;
@@ -113,6 +110,8 @@ int btintel_set_diag(struct hci_dev *hdev, bool enable)
 	skb = __hci_cmd_sync(hdev, 0xfc43, 3, param, HCI_INIT_TIMEOUT);
 	if (IS_ERR(skb)) {
 		err = PTR_ERR(skb);
+		if (err == -ENODATA)
+			return 0;
 		BT_ERR("%s: Changing Intel diagnostic mode failed (%d)",
 		       hdev->name, err);
 		return err;
drivers/bluetooth/btusb.c +1 -0
index 27830da67063..ab82c02d7e92 100644
@@ -2894,6 +2894,7 @@ static int btusb_probe(struct usb_interface *intf,
 		hdev->set_diag = btintel_set_diag;
 		hdev->set_bdaddr = btintel_set_bdaddr;
 		set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
+		set_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &hdev->quirks);
 	}
 
 	if (id->driver_info & BTUSB_MARVELL)
Signature · 1 line
2.4.3