1 files changed, 6 insertions, 0 deletions

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;