Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f3ecbf4 authored by Sasha Levin's avatar Sasha Levin Committed by Greg Kroah-Hartman
Browse files

Revert "Bluetooth: Move shutdown callback before flushing tx and rx queue" 



This reverts commit abbcd61d.

Botched backport, dropping to reword for next release.

Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 245f15a4

net/bluetooth/hci_core.c

+0 −8
Original line number Diff line number Diff line
@@ -1691,14 +1691,6 @@ int hci_dev_do_close(struct hci_dev *hdev) 
	hci_request_cancel_all(hdev);

	hci_req_sync_lock(hdev);



	if (!hci_dev_test_flag(hdev, HCI_UNREGISTER) &&

	    !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &&

	    test_bit(HCI_UP, &hdev->flags)) {

		/* Execute vendor specific shutdown routine */

		if (hdev->shutdown)

			hdev->shutdown(hdev);

	}



	if (!test_and_clear_bit(HCI_UP, &hdev->flags)) {

		cancel_delayed_work_sync(&hdev->cmd_timer);

		hci_req_sync_unlock(hdev);