diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-17 12:07:44 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-17 12:07:44 -0500 |
| commit | 811477de5f6d65baea69f25cb5528d428b82cc9c (patch) | |
| tree | f3c4245199b08f3f5729e46ac02aa4beb92156bb /net/bluetooth/hci_event.c | |
| parent | fa1e492aa3cbafba9f8fc6d05e5b08a3091daf4a (diff) | |
| parent | 4668cce527acb3bd048c5e6c99b157a14b214671 (diff) | |
| download | talos-obmc-linux-811477de5f6d65baea69f25cb5528d428b82cc9c.tar.gz talos-obmc-linux-811477de5f6d65baea69f25cb5528d428b82cc9c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 705078a0cc39..81b44481d0d9 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -2688,7 +2688,7 @@ static void hci_cmd_complete_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)) queue_work(hdev->workqueue, &hdev->cmd_work); |
