Commit 7bdb8a5c authored Jul 26, 2011 by Szymon Janc Committed by Gustavo Padovan Aug 11, 2011

Bluetooth: Don't use cmd_timer to timeout HCI reset command



No command should be send before Command Complete event for HCI
reset is received. This fix regression introduced by commit
6bd32326(Bluetooth: Use proper timer for hci command timout)
for chips whose reset command takes longer to complete (e.g. CSR)
resulting in next command being send before HCI reset completed.

Signed-off-by: Szymon Janc <szymon@janc.net.pl>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

parent 6be6b11f

net/bluetooth/hci_core.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1209,7 +1209,6 @@ static void hci_cmd_timer(unsigned long arg)

		BT_ERR("%s command tx timeout", hdev->name);
		atomic_set(&hdev->cmd_cnt, 1);
		clear_bit(HCI_RESET, &hdev->flags);
		tasklet_schedule(&hdev->cmd_task);
		}

		@@ -2408,6 +2407,9 @@ static void hci_cmd_task(unsigned long arg)
		if (hdev->sent_cmd) {
		atomic_dec(&hdev->cmd_cnt);
		hci_send_frame(skb);
		if (test_bit(HCI_RESET, &hdev->flags))
		del_timer(&hdev->cmd_timer);
		else
		mod_timer(&hdev->cmd_timer,
		jiffies + msecs_to_jiffies(HCI_CMD_TIMEOUT));
		} else {