2 files changed, 2 insertions, 4 deletions

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index efd5c926cc1b..1181db08d9de 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -287,6 +287,8 @@ int hci_conn_del(struct hci_conn *conn)
 
         skb_queue_purge(&conn->data_q);
 
+        hci_conn_del_sysfs(conn);
+
         return 0;
 }
 
@@ -560,8 +562,6 @@ void hci_conn_hash_flush(struct hci_dev *hdev)
 
                 c->state = BT_CLOSED;
 
-                hci_conn_del_sysfs(c);
-
                 hci_proto_disconn_cfm(c, 0x16);
                 hci_conn_del(c);
         }
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index c396542c2b82..55534244c3a0 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1019,8 +1019,6 @@ static inline void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff
         if (conn) {
                 conn->state = BT_CLOSED;
 
-                hci_conn_del_sysfs(conn);
-
                 hci_proto_disconn_cfm(conn, ev->reason);
                 hci_conn_del(conn);
         }