lkml.org 
[lkml]   [2019]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 067/107] Bluetooth: Fix unnecessary error message for HCI request completion
    Date
    From: Johan Hedberg <johan.hedberg@intel.com>

    [ Upstream commit 1629db9c75342325868243d6bca5853017d91cf8 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/bluetooth/hci_event.c | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
    index d2f9eb169ba8..6f78489fdb13 100644
    --- a/net/bluetooth/hci_event.c
    +++ b/net/bluetooth/hci_event.c
    @@ -5212,6 +5212,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_DBG("Last event is not cmd complete (0x%2.2x)", hdr->evt);
    return false;
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-01-28 17:47    [W:5.232 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site