p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Marcel Holtmann 2015-06-07 10:01:01 +02:00 committed by Johan Hedberg
parent ecffc80478
commit 9641d3435f
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/bluetooth/btusb.c
View File

@ -1344,7 +1344,6 @@ static int btusb_setup_csr(struct hci_dev *hdev)
{ {
struct hci_rp_read_local_version *rp; struct hci_rp_read_local_version *rp;
struct sk_buff *skb; struct sk_buff *skb;
int ret;
BT_DBG("%s", hdev->name); 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; rp = (struct hci_rp_read_local_version *)skb->data;
if (!rp->status) { if (le16_to_cpu(rp->manufacturer) != 10) {
if (le16_to_cpu(rp->manufacturer) != 10) { /* Clear the reset quirk since this is not an actual
/* Clear the reset quirk since this is not an actual * early Bluetooth 1.1 device from CSR.
* early Bluetooth 1.1 device from CSR. */
*/ clear_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
clear_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
/* These fake CSR controllers have all a broken /* These fake CSR controllers have all a broken
* stored link key handling and so just disable it. * stored link key handling and so just disable it.
*/ */
set_bit(HCI_QUIRK_BROKEN_STORED_LINK_KEY, set_bit(HCI_QUIRK_BROKEN_STORED_LINK_KEY, &hdev->quirks);
&hdev->quirks);
}
} }
ret = -bt_to_errno(rp->status);
kfree_skb(skb); kfree_skb(skb);
return ret; return 0;
} }
static const struct firmware *btusb_setup_intel_get_fw(struct hci_dev *hdev, static const struct firmware *btusb_setup_intel_get_fw(struct hci_dev *hdev,