From: Johan Hedberg <johan.hedberg@intel.com>
Date: Wed, 22 Feb 2012 20:06:38 +0000 (+0200)
Subject: Bluetooth: mgmt: Check for HCI_UP in update_eir() and update_class()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7770c4aacaf34fb69cb2acfb7469e9b4e34f1674;p=deliverable%2Flinux.git

Bluetooth: mgmt: Check for HCI_UP in update_eir() and update_class()

These functions should just silently fail when we're not powered on
instead of trying to send HCI commands.

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 23421f05abf2..3a2066504ffe 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -532,6 +532,9 @@ static int update_eir(struct hci_dev *hdev)
 {
 	struct hci_cp_write_eir cp;
 
+	if (!test_bit(HCI_UP, &hdev->flags))
+		return 0;
+
 	if (!(hdev->features[6] & LMP_EXT_INQ))
 		return 0;
 
@@ -570,6 +573,9 @@ static int update_class(struct hci_dev *hdev)
 
 	BT_DBG("%s", hdev->name);
 
+	if (!test_bit(HCI_UP, &hdev->flags))
+		return 0;
+
 	if (test_bit(HCI_SERVICE_CACHE, &hdev->dev_flags))
 		return 0;