2 files changed, 2 insertions, 9 deletions

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 9483320f6dad..34d1a3c822bf 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -259,22 +259,14 @@ int hci_conn_del(struct hci_conn *conn)
         }
 
         tasklet_disable(&hdev->tx_task);
-
-        hci_conn_del_sysfs(conn);
-
         hci_conn_hash_del(hdev, conn);
         if (hdev->notify)
                 hdev->notify(hdev, HCI_NOTIFY_CONN_DEL);
-
         tasklet_enable(&hdev->tx_task);
-
         skb_queue_purge(&conn->data_q);
-
+        hci_conn_del_sysfs(conn);
         hci_dev_put(hdev);
 
-        /* will free via device release */
-        put_device(&conn->dev);
-
         return 0;
 }
 
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index cef1e3e1881c..cad510309dcf 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -320,6 +320,7 @@ static void del_conn(struct work_struct *work)
 {
         struct hci_conn *conn = container_of(work, struct hci_conn, work);
         device_del(&conn->dev);
+        put_device(&conn->dev);
 }
 
 void hci_conn_del_sysfs(struct hci_conn *conn)