diff options
| author | Andre Guedes | 2013-03-08 15:20:18 +0100 |
|---|---|---|
| committer | Gustavo Padovan | 2013-03-09 21:11:26 +0100 |
| commit | 34739c1effcbdc6d210324e86514fa2d2d47b12b (patch) | |
| tree | bfd17bde1effc2b3366e8b3b7c3bcaa73acedc46 /net/bluetooth/hci_core.c | |
| parent | Bluetooth: Make hci_req_add returning void (diff) | |
| download | kernel-qcow2-linux-34739c1effcbdc6d210324e86514fa2d2d47b12b.tar.gz kernel-qcow2-linux-34739c1effcbdc6d210324e86514fa2d2d47b12b.tar.xz kernel-qcow2-linux-34739c1effcbdc6d210324e86514fa2d2d47b12b.zip | |
Bluetooth: Check req->err in hci_req_add
If req->err is set, there is no point in queueing the HCI command
in HCI request command queue since it won't be sent anyway.
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 1c678757c83a..02070dcdfbbb 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -2536,6 +2536,12 @@ void hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param) BT_DBG("%s opcode 0x%4.4x plen %d", hdev->name, opcode, plen); + /* If an error occured during request building, there is no point in + * queueing the HCI command. We can simply return. + */ + if (req->err) + return; + skb = hci_prepare_cmd(hdev, opcode, plen, param); if (!skb) { BT_ERR("%s no memory for command (opcode 0x%4.4x)", |