From 26b9fe49f49cd3e9b3fdbf27ff2440101c2942f7 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Wed, 18 Jan 2012 16:14:43 +0200 Subject: [PATCH] --- yaml --- r: 290881 b: refs/heads/master c: 7005ff1780ca7ad5ed2ec710ad35affc48362ebf h: refs/heads/master i: 290879: 7835871ae4aa815b3df02a5d7aaa03c418b7a450 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_event.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cb0861111ac9..6acc610d0cbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c9e919511f87f10491628c6b44bc4675822f307 +refs/heads/master: 7005ff1780ca7ad5ed2ec710ad35affc48362ebf diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c index 42d63522270f..54132a909ea5 100644 --- a/trunk/net/bluetooth/hci_event.c +++ b/trunk/net/bluetooth/hci_event.c @@ -195,8 +195,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) hci_req_complete(hdev, HCI_OP_RESET, status); - /* Reset all flags, except persistent ones like HCI_MGMT */ - hdev->dev_flags &= BIT(HCI_MGMT); + /* Reset all flags, except persistent ones */ + hdev->dev_flags &= BIT(HCI_MGMT) | BIT(HCI_SETUP) | BIT(HCI_AUTO_OFF); } static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)