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>

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index eec70a4ba36cd4d84a6975bcb25967ad8958f499..86e63a707f5a7269e5d065697a2415b88d9b4031 100644 (file)
--- 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))