From 20a2f596ff0639906b7762f2a92815ae8f645e71 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] --- yaml --- r: 291008 b: refs/heads/master c:
 f1f0eb02213a3003ecb10b9c61694e588267b824 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/bluetooth/mgmt.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6d266c557eaf..a27fb9dfe821 100644
--- 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
index eec70a4ba36c..86e63a707f5a 100644
--- 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))