---

yaml --- r: 291008 b: refs/heads/master c: f1f0eb0 h: refs/heads/master v: v3
git-mirror · Feb 21, 2012 · 20a2f59 · 20a2f59
1 parent b070bd7
commit 20a2f59
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df2c6c5ed5c0bc13b78e855d3e5d9aa3472567ba
+refs/heads/master: f1f0eb02213a3003ecb10b9c61694e588267b824
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/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))