From: Archie Pusaka <apusaka@chromium.org>
Date: Thu, 26 Jan 2023 13:38:17 +0000 (+0300)
Subject: Bluetooth: hci_sync: cancel cmd_timer if hci_open failed
X-Git-Tag: baikal/aarch64/sdk5.9~64
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=cbbc1d5bf5cc59eed6cf7c6cf875c1272d0a0515;p=kernel.git

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>
---

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index e5e1c139f2118..eb5b2f45deec9 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1582,6 +1582,7 @@ setup_failed:
 			hdev->flush(hdev);
 
 		if (hdev->sent_cmd) {
+			cancel_delayed_work_sync(&hdev->cmd_timer);
 			kfree_skb(hdev->sent_cmd);
 			hdev->sent_cmd = NULL;
 		}