1 files changed, 33 insertions, 39 deletions

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 5935f748c0f9..5fb3df66c2cd 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -486,7 +486,10 @@ static void hci_cc_read_local_commands(struct hci_dev *hdev,
 
         BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
 
-        if (!rp->status)
+        if (rp->status)
+                return;
+
+        if (test_bit(HCI_SETUP, &hdev->dev_flags))
                 memcpy(hdev->commands, rp->commands, sizeof(hdev->commands));
 }
 
@@ -538,12 +541,6 @@ static void hci_cc_read_local_features(struct hci_dev *hdev,
 
         if (hdev->features[0][5] & LMP_EDR_3S_ESCO)
                 hdev->esco_type |= (ESCO_2EV5 | ESCO_3EV5);
-
-        BT_DBG("%s features 0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x", hdev->name,
-               hdev->features[0][0], hdev->features[0][1],
-               hdev->features[0][2], hdev->features[0][3],
-               hdev->features[0][4], hdev->features[0][5],
-               hdev->features[0][6], hdev->features[0][7]);
 }
 
 static void hci_cc_read_local_ext_features(struct hci_dev *hdev,
@@ -1782,7 +1779,9 @@ static u8 hci_to_mgmt_reason(u8 err)
 static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_disconn_complete *ev = (void *) skb->data;
+        u8 reason = hci_to_mgmt_reason(ev->reason);
         struct hci_conn *conn;
+        u8 type;
 
         BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
 
@@ -1792,43 +1791,38 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
         if (!conn)
                 goto unlock;
 
-        if (ev->status == 0)
-                conn->state = BT_CLOSED;
+        if (ev->status) {
+                mgmt_disconnect_failed(hdev, &conn->dst, conn->type,
+                                       conn->dst_type, ev->status);
+                goto unlock;
+        }
 
-        if (test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags) &&
-            (conn->type == ACL_LINK || conn->type == LE_LINK)) {
-                if (ev->status) {
-                        mgmt_disconnect_failed(hdev, &conn->dst, conn->type,
-                                               conn->dst_type, ev->status);
-                } else {
-                        u8 reason = hci_to_mgmt_reason(ev->reason);
+        conn->state = BT_CLOSED;
 
-                        mgmt_device_disconnected(hdev, &conn->dst, conn->type,
-                                                 conn->dst_type, reason);
-                }
-        }
+        if (test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))
+                mgmt_device_disconnected(hdev, &conn->dst, conn->type,
+                                         conn->dst_type, reason);
 
-        if (ev->status == 0) {
-                u8 type = conn->type;
+        if (conn->type == ACL_LINK && conn->flush_key)
+                hci_remove_link_key(hdev, &conn->dst);
 
-                if (type == ACL_LINK && conn->flush_key)
-                        hci_remove_link_key(hdev, &conn->dst);
-                hci_proto_disconn_cfm(conn, ev->reason);
-                hci_conn_del(conn);
+        type = conn->type;
 
-                /* Re-enable advertising if necessary, since it might
-                 * have been disabled by the connection. From the
-                 * HCI_LE_Set_Advertise_Enable command description in
-                 * the core specification (v4.0):
-                 * "The Controller shall continue advertising until the Host
-                 * issues an LE_Set_Advertise_Enable command with
-                 * Advertising_Enable set to 0x00 (Advertising is disabled)
-                 * or until a connection is created or until the Advertising
-                 * is timed out due to Directed Advertising."
-                 */
-                if (type == LE_LINK)
-                        mgmt_reenable_advertising(hdev);
-        }
+        hci_proto_disconn_cfm(conn, ev->reason);
+        hci_conn_del(conn);
+
+        /* Re-enable advertising if necessary, since it might
+         * have been disabled by the connection. From the
+         * HCI_LE_Set_Advertise_Enable command description in
+         * the core specification (v4.0):
+         * "The Controller shall continue advertising until the Host
+         * issues an LE_Set_Advertise_Enable command with
+         * Advertising_Enable set to 0x00 (Advertising is disabled)
+         * or until a connection is created or until the Advertising
+         * is timed out due to Directed Advertising."
+         */
+        if (type == LE_LINK)
+                mgmt_reenable_advertising(hdev);
 
 unlock:
         hci_dev_unlock(hdev);