diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-31 16:26:01 -0300 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-31 16:26:01 -0300 |
| commit | 220b881a77eca96afdd6037dbca3441e8938228f (patch) | |
| tree | 51d1a273521238b5127409c9ea2c0b2df02ec6e9 /net/bluetooth/hci_event.c | |
| parent | 80a1e1dbf62a08984d4c1bfb5a4bca38c3e1664f (diff) | |
| parent | 6f5ef998b7b0b1bf1471654bf6176a5419197128 (diff) | |
| download | kernel_samsung_smdk4412-220b881a77eca96afdd6037dbca3441e8938228f.zip kernel_samsung_smdk4412-220b881a77eca96afdd6037dbca3441e8938228f.tar.gz kernel_samsung_smdk4412-220b881a77eca96afdd6037dbca3441e8938228f.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index da4c662..833797e 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -183,6 +183,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) BT_DBG("%s status 0x%x", hdev->name, status); + clear_bit(HCI_RESET, &hdev->flags); + hci_req_complete(hdev, HCI_OP_RESET, status); } @@ -1865,7 +1867,7 @@ static inline void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb) if (ev->opcode != HCI_OP_NOP) del_timer(&hdev->cmd_timer); - if (ev->ncmd) { + if (ev->ncmd && !test_bit(HCI_RESET, &hdev->flags)) { atomic_set(&hdev->cmd_cnt, 1); if (!skb_queue_empty(&hdev->cmd_q)) tasklet_schedule(&hdev->cmd_task); |