Bluetooth: btusb: Remove double error check from local version command

The __hci_cmd_sync function already handles the command status and
command complete errors. No need to check the status field again.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 7f936db169f5233e3bd962eb3ecfd4fbc58aa5dc..317b276441afe305091d959652bea1ae0fa7e5f1 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -1344,7 +1344,6 @@ static int btusb_setup_csr(struct hci_dev *hdev)
 {
        struct hci_rp_read_local_version *rp;
        struct sk_buff *skb;
-       int ret;
 
        BT_DBG("%s", hdev->name);
 
@@ -1354,26 +1353,21 @@ static int btusb_setup_csr(struct hci_dev *hdev)
 
        rp = (struct hci_rp_read_local_version *)skb->data;
 
-       if (!rp->status) {
-               if (le16_to_cpu(rp->manufacturer) != 10) {
-                       /* Clear the reset quirk since this is not an actual
-                        * early Bluetooth 1.1 device from CSR.
-                        */
-                       clear_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
+       if (le16_to_cpu(rp->manufacturer) != 10) {
+               /* Clear the reset quirk since this is not an actual
+                * early Bluetooth 1.1 device from CSR.
+                */
+               clear_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
 
-                       /* These fake CSR controllers have all a broken
-                        * stored link key handling and so just disable it.
-                        */
-                       set_bit(HCI_QUIRK_BROKEN_STORED_LINK_KEY,
-                               &hdev->quirks);
-               }
+               /* These fake CSR controllers have all a broken
+                * stored link key handling and so just disable it.
+                */
+               set_bit(HCI_QUIRK_BROKEN_STORED_LINK_KEY, &hdev->quirks);
        }
 
-       ret = -bt_to_errno(rp->status);
-
        kfree_skb(skb);
 
-       return ret;
+       return 0;
 }
 
 static const struct firmware *btusb_setup_intel_get_fw(struct hci_dev *hdev,