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

Commit 44f52229 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "Bluetooth: Shutdown controller after workqueues are flushed or cancelled" 

This reverts commit aa9a2ec7 which is
commit 0ea9fd001a14ebc294f112b0361a4e601551d508 upstream.

It has been reported to have problems:
	https://lore.kernel.org/linux-bluetooth/8735ryk0o7.fsf@baylibre.com/



Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Sasha Levin <sashal@kernel.org>
Link: https://lore.kernel.org/r/efee3a58-a4d2-af22-0931-e81b877ab539@roeck-us.net


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 38f54217

net/bluetooth/hci_core.c

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


	BT_DBG("%s %p", hdev->name, 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);

	}



	cancel_delayed_work(&hdev->power_off);



	hci_request_cancel_all(hdev);
@@ -1745,14 +1753,6 @@ int hci_dev_do_close(struct hci_dev *hdev) 
		clear_bit(HCI_INIT, &hdev->flags);

	}



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

	}



	/* flush cmd  work */

	flush_work(&hdev->cmd_work);