Commit 568f44f6 authored Nov 23, 2015 by Johan Hedberg Committed by Marcel Holtmann Nov 23, 2015

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>

parent 40b25fe5

net/bluetooth/hci_request.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -220,8 +220,14 @@ int __hci_req_sync(struct hci_dev hdev, int (func)(struct hci_request *req,
		* trigger any commands to be sent. This is normal behavior
		* and should not trigger an error return.
		*/
		if (err == -ENODATA)
		if (err == -ENODATA) {
		if (hci_status)
		*hci_status = 0;
		return 0;
		}

		if (hci_status)
		*hci_status = HCI_ERROR_UNSPECIFIED;

		return err;
		}