diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-04 15:51:49 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-04 15:51:49 +0100 |
| commit | 2fb20e2e35cd1455d022ab7a553d7f1663ffbdeb (patch) | |
| tree | 4b3bb0f76c15264fe7d4cced91127f3d96ff31f5 /net/bluetooth/hci_event.c | |
| parent | Merge branch 'for-rmk/virt/kvm/core' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | Merge branch 'clocks/broadcast-arm' of git://linux-arm.org/linux-mr into for-... (diff) | |
| download | linux-2fb20e2e35cd1455d022ab7a553d7f1663ffbdeb.tar.xz linux-2fb20e2e35cd1455d022ab7a553d7f1663ffbdeb.zip | |
Merge branch 'for-rmk/broadcast' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
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); |