diff options
| author | Szymon Janc <szymon@janc.net.pl> | 2011-07-26 22:46:54 +0200 |
|---|---|---|
| committer | Jaikumar Ganesh <jaikumar@google.com> | 2011-08-11 18:18:45 -0700 |
| commit | dfe4ecda301b6f01c845fc56439cdf7d351e2961 (patch) | |
| tree | ac69026c911af792083c7e7c78a32f44714f5516 | |
| parent | 9abd59b0df155835a970c2b9c8f93367eb793797 (diff) | |
| download | kernel_samsung_tuna-dfe4ecda301b6f01c845fc56439cdf7d351e2961.zip kernel_samsung_tuna-dfe4ecda301b6f01c845fc56439cdf7d351e2961.tar.gz kernel_samsung_tuna-dfe4ecda301b6f01c845fc56439cdf7d351e2961.tar.bz2 | |
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
6bd32326cda(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>
| -rw-r--r-- | net/bluetooth/hci_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 908fcd3..3b39198 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -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,7 +2407,10 @@ static void hci_cmd_task(unsigned long arg) if (hdev->sent_cmd) { atomic_dec(&hdev->cmd_cnt); hci_send_frame(skb); - mod_timer(&hdev->cmd_timer, + 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 { skb_queue_head(&hdev->cmd_q, skb); |