Commit b79f44c1 authored Apr 11, 2011 by Vinicius Costa Gomes Committed by Gustavo Padovan Apr 18, 2011

Bluetooth: Fix keeping the command timer running



In the teardown path the reset command is sent to the controller,
this event causes the command timer to be reactivated.

So the timer is removed in two situations, when the adapter isn't
marked as UP and when we know that some command has been sent.

Reported-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

parent 7a74aeb0

net/bluetooth/hci_core.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -587,10 +587,8 @@ static int hci_dev_do_close(struct hci_dev *hdev)
		hci_req_cancel(hdev, ENODEV);
		hci_req_lock(hdev);

		/* Stop timer, it might be running */
		del_timer_sync(&hdev->cmd_timer);

		if (!test_and_clear_bit(HCI_UP, &hdev->flags)) {
		del_timer_sync(&hdev->cmd_timer);
		hci_req_unlock(hdev);
		return 0;
		}
		@@ -629,6 +627,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)

		/* Drop last sent command */
		if (hdev->sent_cmd) {
		del_timer_sync(&hdev->cmd_timer);
		kfree_skb(hdev->sent_cmd);
		hdev->sent_cmd = NULL;
		}