Pull bugzilla-9194 into release branch

[linux-2.6] / net / bluetooth / hci_conn.c

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 9483320f6dad01e967e219297ff798c5d1a29af0..34d1a3c822bf54b4cdef61add3ab243ac9c8fd13 100644 (file)
--- 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;
 }