summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorArchie Pusaka <apusaka@chromium.org>2022-10-05 09:09:47 +0200
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2022-12-12 23:19:23 +0100
commit97dfaf073f5881c624856ef293be307b6166115c (patch)
treeb56bdda44b5b021486b3fae7e693e2cba23ac8b6 /net/bluetooth
parentBluetooth: hci_sync: Fix not able to set force_static_address (diff)
downloadlinux-97dfaf073f5881c624856ef293be307b6166115c.tar.xz
linux-97dfaf073f5881c624856ef293be307b6166115c.zip
Bluetooth: hci_sync: cancel cmd_timer if hci_open failed
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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_sync.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 1cd05072dbb7..4debe205d4af 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -4721,6 +4721,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;
}