This moves msft_do_close() from hci_dev_do_close() to
hci_unregister_dev() to avoid clearing MSFT extension info. This also
avoids retrieving MSFT info upon every msft_do_open() if MSFT extension
has been initialized.
The following test steps were performed.
(1) boot the test device and verify the MSFT support debug log in syslog
(2) restart bluetoothd and verify msft_do_close() doesn't get invoked
Signed-off-by: Miao-chen Chou <mcc...@chromium.org>
Reviewed-by: Abhishek Pandit-Subedi <abhishekpan...@chromium.org>
Reviewed-by: Archie Pusaka <apus...@chromium.org>
---
(no changes since v1)
net/bluetooth/hci_core.c | 4 ++--
net/bluetooth/msft.c | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 9d2c9a1c552fd..8471be105a2ac 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1780,8 +1780,6 @@ int hci_dev_do_close(struct hci_dev *hdev)
hci_sock_dev_event(hdev, HCI_DEV_DOWN);
- msft_do_close(hdev);
-
if (hdev->flush)
hdev->flush(hdev);
@@ -3869,6 +3867,8 @@ void hci_unregister_dev(struct hci_dev *hdev)
unregister_pm_notifier(&hdev->suspend_notifier);
cancel_work_sync(&hdev->suspend_prepare);
+ msft_do_close(hdev);
+
hci_dev_do_close(hdev);
if (!test_bit(HCI_INIT, &hdev->flags) &&
diff --git a/net/bluetooth/msft.c b/net/bluetooth/msft.c
index 4b39534a14a18..d9d2269bc93ef 100644
--- a/net/bluetooth/msft.c
+++ b/net/bluetooth/msft.c
@@ -76,7 +76,8 @@ void msft_do_open(struct hci_dev *hdev)
{
struct msft_data *msft;
- if (hdev->msft_opcode == HCI_OP_NOP)
+ /* Skip if opcode is not supported or MSFT has been initiatlized */
+ if (hdev->msft_opcode == HCI_OP_NOP || hdev->msft_data)
return;
bt_dev_dbg(hdev, "Initialize MSFT extension");
--
2.29.2.684.gfbc64c5ab5-goog
