diff --git a/[refs] b/[refs]
index ce13d261e5e1..57317ba5b0ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ec37034ef36b89cfb060bd9273db24e6acb1b3a
+refs/heads/master: 7770c4aacaf34fb69cb2acfb7469e9b4e34f1674
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index 23421f05abf2..3a2066504ffe 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/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;