From f1f0eb02213a3003ecb10b9c61694e588267b824 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Tue, 21 Feb 2012 17:15:41 +0200
Subject: [PATCH] Bluetooth: mgmt: Fix current settings values when powered off
We should not stop iterating through the various settings if powered off
since most may still be set even then.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
---
net/bluetooth/mgmt.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index eec70a4ba36cd..86e63a707f5a7 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -392,10 +392,7 @@ static u32 get_current_settings(struct hci_dev *hdev)
{
u32 settings = 0;
- if (!test_bit(HCI_UP, &hdev->flags))
- return settings;
-
- if (!test_bit(HCI_AUTO_OFF, &hdev->dev_flags))
+ if (hdev_is_powered(hdev))
settings |= MGMT_SETTING_POWERED;
if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags))
--
2.30.2