diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-21 16:15:41 +0100 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-21 19:04:39 +0100 |
| commit | f1f0eb02213a3003ecb10b9c61694e588267b824 (patch) | |
| tree | becece4750f4c38b314d45a905a5739e6bb11397 /net/bluetooth | |
| parent | Bluetooth: mgmt: Fix Removing discoverable timeout in set_connectable (diff) | |
| download | linux-f1f0eb02213a3003ecb10b9c61694e588267b824.tar.xz linux-f1f0eb02213a3003ecb10b9c61694e588267b824.zip | |
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>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/mgmt.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index eec70a4ba36c..86e63a707f5a 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)) |