]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Bluetooth: Fix resetting HCI_MGMT flag
authorJohan Hedberg <johan.hedberg@intel.com>
Sun, 8 Jan 2012 21:39:40 +0000 (23:39 +0200)
committerJohan Hedberg <johan.hedberg@intel.com>
Mon, 13 Feb 2012 15:01:25 +0000 (17:01 +0200)
The HCI_MGMT flag should not be cleared when resetting a HCI device.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/hci_event.c

index 2d39ede1f202453965facd0d52f6cda9cbf72fdb..f3dafae6e1db1efffd42ca6366555931459f596a 100644 (file)
@@ -195,7 +195,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
 
        hci_req_complete(hdev, HCI_OP_RESET, status);
 
-       hdev->dev_flags = 0;
+       /* Reset all flags, except persistent ones like HCI_MGMT */
+       hdev->dev_flags &= BIT(HCI_MGMT);
 }
 
 static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)