diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2015-11-23 07:40:47 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2015-11-23 07:50:11 -0500 |
commit | 568f44f63621e00af9895f09c70aa38025be8813 (patch) | |
tree | 1ddec04421d48c132e12797030355155a1d0cbd4 /net/bluetooth/hci_request.c | |
parent | 40b25fe5dc57a6557b96241b75ae63dce716a487 (diff) |
Bluetooth: Fix returning proper HCI status from __hci_req_sync
There were a couple of code paths missed by the previous patch that
added a HCI status return parameter to __hci_req_sync. This patch adds
the missing assignments for them.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_request.c')
-rw-r--r-- | net/bluetooth/hci_request.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c index 76bd912be9fe..e639671f54bd 100644 --- a/net/bluetooth/hci_request.c +++ b/net/bluetooth/hci_request.c | |||
@@ -220,8 +220,14 @@ int __hci_req_sync(struct hci_dev *hdev, int (*func)(struct hci_request *req, | |||
220 | * trigger any commands to be sent. This is normal behavior | 220 | * trigger any commands to be sent. This is normal behavior |
221 | * and should not trigger an error return. | 221 | * and should not trigger an error return. |
222 | */ | 222 | */ |
223 | if (err == -ENODATA) | 223 | if (err == -ENODATA) { |
224 | if (hci_status) | ||
225 | *hci_status = 0; | ||
224 | return 0; | 226 | return 0; |
227 | } | ||
228 | |||
229 | if (hci_status) | ||
230 | *hci_status = HCI_ERROR_UNSPECIFIED; | ||
225 | 231 | ||
226 | return err; | 232 | return err; |
227 | } | 233 | } |