Message ID | 20221005150934.1.Ife932473db2eec6f0bc54226c3328e5fa8c5f97b@changeid (mailing list archive) |
---|---|
State | Awaiting Upstream |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | Bluetooth: hci_sync: cancel cmd_timer if hci_open failed | expand |
Hello: This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: On Wed, 5 Oct 2022 15:09:47 +0800 you wrote: > From: Archie Pusaka <apusaka@chromium.org> > > 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> > > [...] Here is the summary with links: - Bluetooth: hci_sync: cancel cmd_timer if hci_open failed https://git.kernel.org/bluetooth/bluetooth-next/c/64b5c4c8e79c You are awesome, thank you!
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index 76c3107c9f91..a011065220e4 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -4696,6 +4696,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; }