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

Commit ca2eae7d authored by Ian Molton's avatar Ian Molton Committed by Marcel Holtmann
Browse files

Bluetooth: hci_nokia: prevent crash on module removal 



Only cancel any ongoing work after making sure, that no new work
can be scheduled. This fixes a race condition in the remove handler.

Signed-off-by: default avatarIan Molton <ian@mnementh.co.uk>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 2193a980

drivers/bluetooth/hci_nokia.c

+3 −1
Original line number Diff line number Diff line
@@ -770,10 +770,12 @@ static void nokia_bluetooth_serdev_remove(struct serdev_device *serdev) 
	struct hci_uart *hu = &btdev->hu;

	struct hci_dev *hdev = hu->hdev;



	cancel_work_sync(&hu->write_work);



	hci_unregister_dev(hdev);

	hci_free_dev(hdev);



	cancel_work_sync(&hu->write_work);



	hu->proto->close(hu);



	pm_runtime_disable(&btdev->serdev->dev);