From: Johan Hedberg <johan.hedberg@intel.com>
Date: Fri, 15 Mar 2013 22:06:58 +0000 (-0500)
Subject: Bluetooth: Clear non-persistent flags when closing HCI device
X-Git-Tag: v3.10-rc1~66^2~51^2^2~215^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f9f85279fd3a3284023231c7f0796f98c417e7cd;p=platform%2Fkernel%2Flinux-stable.git

Bluetooth: Clear non-persistent flags when closing HCI device

When hci_dev_do_close() is called we should make sure to clear all
non-persistent flags in hci->dev_flags.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 02070dcdfbbb..059bbae534d1 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1139,6 +1139,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)
 
 	/* Clear flags */
 	hdev->flags = 0;
+	hdev->dev_flags &= ~HCI_PERSISTENT_MASK;
 
 	/* Controller radio is available but is currently powered down */
 	hdev->amp_status = 0;