]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Bluetooth: btbcm: Fix calls to __hci_cmd_sync()
authorFrederic Danis <frederic.danis@linux.intel.com>
Fri, 15 May 2015 09:58:42 +0000 (11:58 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Fri, 15 May 2015 14:04:50 +0000 (16:04 +0200)
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>
drivers/bluetooth/btbcm.c

index 4bba86677adc64553fe8415d9b6812bfb3e1449d..728fce38a5a24cd6fb142f77b7a7178508d8e0c1 100644 (file)
@@ -55,12 +55,6 @@ int btbcm_check_bdaddr(struct hci_dev *hdev)
        }
 
        bda = (struct hci_rp_read_bd_addr *)skb->data;
-       if (bda->status) {
-               BT_ERR("%s: BCM: Device address result failed (%02x)",
-                      hdev->name, bda->status);
-               kfree_skb(skb);
-               return -bt_to_errno(bda->status);
-       }
 
        /* The address 00:20:70:02:A0:00 indicates a BCM20702A0 controller
         * with no configured address.