Commit 1629db9c authored Nov 27, 2018 by Johan Hedberg Committed by Marcel Holtmann Dec 19, 2018

Bluetooth: Fix unnecessary error message for HCI request completion



In case a command which completes in Command Status was sent using the
hci_cmd_send-family of APIs there would be a misleading error in the
hci_get_cmd_complete function, since the code would be trying to fetch
the Command Complete parameters when there are none.

Avoid the misleading error and silently bail out from the function in
case the received event is a command status.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent 22bba805

net/bluetooth/hci_event.c

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5711,6 +5711,12 @@ static bool hci_get_cmd_complete(struct hci_dev *hdev, u16 opcode,
	return true;		return true;
	}		}

			/* Check if request ended in Command Status - no way to retreive
			* any extra parameters in this case.
			*/
			if (hdr->evt == HCI_EV_CMD_STATUS)
			return false;

	if (hdr->evt != HCI_EV_CMD_COMPLETE) {		if (hdr->evt != HCI_EV_CMD_COMPLETE) {
	bt_dev_err(hdev, "last event is not cmd complete (0x%2.2x)",		bt_dev_err(hdev, "last event is not cmd complete (0x%2.2x)",
	hdr->evt);		hdr->evt);