diff options
author | Frederic Danis <frederic.danis@linux.intel.com> | 2015-05-15 05:58:41 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2015-05-15 10:04:49 -0400 |
commit | b1f5cf0cae090dae9ac045670fec2d0c5253592a (patch) | |
tree | 6a3effaf03c9c956cd242c59229293911866962b /drivers/bluetooth | |
parent | 5e13441ca413f5a8d04601d675accb35d37c6b08 (diff) |
Bluetooth: btintel: Fix calls to __hci_cmd_sync()
Remove test of command reply status as it is already performed by
__hci_cmd_sync().
__hci_cmd_sync_ev() function already returns an error if it got a
non-zero status either through a Command Complete or a Command
Status event.
For both of these events the status is collected up in the event
handlers called by hci_event_packet() and then passed as the second
parameter to req_complete_skb(). The req_complete_skb() callback in
turn is hci_req_sync_complete() for __hci_cmd_sync_ev() which stores
the status in hdev->req_result. The hdev->req_result is then further
converted through bt_to_errno() back in __hci_cmd_sync_ev().
Signed-off-by: Frederic Danis <frederic.danis@linux.intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r-- | drivers/bluetooth/btintel.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index 2d43d4279b00..828f2f8d1568 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c | |||
@@ -53,12 +53,6 @@ int btintel_check_bdaddr(struct hci_dev *hdev) | |||
53 | } | 53 | } |
54 | 54 | ||
55 | bda = (struct hci_rp_read_bd_addr *)skb->data; | 55 | bda = (struct hci_rp_read_bd_addr *)skb->data; |
56 | if (bda->status) { | ||
57 | BT_ERR("%s: Intel device address result failed (%02x)", | ||
58 | hdev->name, bda->status); | ||
59 | kfree_skb(skb); | ||
60 | return -bt_to_errno(bda->status); | ||
61 | } | ||
62 | 56 | ||
63 | /* For some Intel based controllers, the default Bluetooth device | 57 | /* For some Intel based controllers, the default Bluetooth device |
64 | * address 00:03:19:9E:8B:00 can be found. These controllers are | 58 | * address 00:03:19:9E:8B:00 can be found. These controllers are |