Merge tag 'pinctrl-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[linux] / net / bluetooth / hci_event.c

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index ef9928d..ac2826c 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -5711,6 +5711,12 @@ static bool hci_get_cmd_complete(struct hci_dev *hdev, u16 opcode,
                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) {
                bt_dev_err(hdev, "last event is not cmd complete (0x%2.2x)",
                           hdr->evt);