Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6-omap-h63xx.git] / net / bluetooth / hci_event.c

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 899b8991a4668a88dbff8eff0243e55ea44feb71..55534244c3a029b4336aab5ad14c89d9d75ea9b2 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1019,9 +1019,7 @@ 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_ind(conn, ev->reason);
+               hci_proto_disconn_cfm(conn, ev->reason);
                hci_conn_del(conn);
        }