OSDN Git Service

Bluetooth: btusb: Fix a unspported condition to set available debug features
authorJun Miao <jun.miao@windriver.com>
Fri, 9 Jul 2021 13:46:25 +0000 (21:46 +0800)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 22 Jul 2021 14:16:19 +0000 (16:16 +0200)
When reading the support debug features failed, there are not available
features init. Continue to set the debug features is illogical, we should
skip btintel_set_debug_features(), even if check it by "if (!features)".

Fixes: c453b10c2b28 ("Bluetooth: btusb: Configure Intel debug feature based on available support")
Signed-off-by: Jun Miao <jun.miao@windriver.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
drivers/bluetooth/btusb.c

index edfa5a3..5969860 100644 (file)
@@ -2910,10 +2910,11 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
        /* Read the Intel supported features and if new exception formats
         * supported, need to load the additional DDC config to enable.
         */
-       btintel_read_debug_features(hdev, &features);
-
-       /* Set DDC mask for available debug features */
-       btintel_set_debug_features(hdev, &features);
+       err = btintel_read_debug_features(hdev, &features);
+       if (!err) {
+               /* Set DDC mask for available debug features */
+               btintel_set_debug_features(hdev, &features);
+       }
 
        /* Read the Intel version information after loading the FW  */
        err = btintel_read_version(hdev, &ver);
@@ -3006,10 +3007,11 @@ static int btusb_setup_intel_newgen(struct hci_dev *hdev)
        /* Read the Intel supported features and if new exception formats
         * supported, need to load the additional DDC config to enable.
         */
-       btintel_read_debug_features(hdev, &features);
-
-       /* Set DDC mask for available debug features */
-       btintel_set_debug_features(hdev, &features);
+       err = btintel_read_debug_features(hdev, &features);
+       if (!err) {
+               /* Set DDC mask for available debug features */
+               btintel_set_debug_features(hdev, &features);
+       }
 
        /* Read the Intel version information after loading the FW  */
        err = btintel_read_version_tlv(hdev, &version);