summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-03-02 05:06:04 +0400
committerJohan Hedberg <johan.hedberg@intel.com>2012-03-02 05:19:24 +0400
commit9f8ce967caed427f78d00bb6b07d79cb040a88bd (patch)
tree0ff8b8b19e431d602a51e2d4a781dd26479c95d7 /net/bluetooth
parent17b02e625662906f370a3eb5e7495cf06ed7d4a4 (diff)
downloadlinux-9f8ce967caed427f78d00bb6b07d79cb040a88bd.tar.xz
Bluetooth: Fix clearing of HCI_PENDING_CLASS flag
When doing reset HCI_PENDING_CLASS is one of the flags that should be cleared (since it's used for a pending HCI command and a reset clear all pending commands). Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index aee9556e1039..d6c41bbfe759 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -193,7 +193,7 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
hci_req_complete(hdev, HCI_OP_RESET, status);
/* Reset all non-persistent flags */
- hdev->dev_flags &= ~(BIT(HCI_LE_SCAN));
+ hdev->dev_flags &= ~(BIT(HCI_LE_SCAN) | BIT(HCI_PENDING_CLASS));
hdev->discovery.state = DISCOVERY_STOPPED;
}