diff options
| author | Archie Pusaka <apusaka@chromium.org> | 2023-01-26 16:36:13 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-01 08:34:35 +0100 |
| commit | 83b15fe00a45c5c24fed1b3398b77508980eca96 (patch) | |
| tree | b30ebb52dc72ace52fd81b81356b7fe4fe5f7f76 /net | |
| parent | cc2a13ec84a5db58089a2f0fc415c781c980fedc (diff) | |
| download | linux-stable-83b15fe00a45c5c24fed1b3398b77508980eca96.tar.gz linux-stable-83b15fe00a45c5c24fed1b3398b77508980eca96.tar.bz2 linux-stable-83b15fe00a45c5c24fed1b3398b77508980eca96.zip | |
Bluetooth: hci_sync: cancel cmd_timer if hci_open failed
commit 97dfaf073f5881c624856ef293be307b6166115c upstream.
If a command is already sent, we take care of freeing it, but we
also need to cancel the timeout as well.
Signed-off-by: Archie Pusaka <apusaka@chromium.org>
Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@google.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_sync.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index 67dd4c9fa4a5..3eec688a88a9 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -4703,6 +4703,7 @@ int hci_dev_open_sync(struct hci_dev *hdev) hdev->flush(hdev); if (hdev->sent_cmd) { + cancel_delayed_work_sync(&hdev->cmd_timer); kfree_skb(hdev->sent_cmd); hdev->sent_cmd = NULL; } |