commit d45c54a4be317a44fc8afaf05a53ea6811be818c
author Linux Build Service Account <lnxbuild@localhost> Thu Jan 03 02:15:40 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jan 03 02:15:39 2013 -0800
tree f8435463ee7749ed3c4d4622cabd6409e36e9136
parent edb4e22b8f6c0a5b21332405d85b18d54f911147
parent 0bb14f0afa8b138404946b1895a9f851d3ead41c

Merge "Bluetooth: Handle pairing cancel req for LE device"

net/bluetooth/smp.c

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 56b2cfa..517779f 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -446,6 +446,8 @@
 		smp_send_cmd(conn, SMP_CMD_PAIRING_FAIL, sizeof(reason),
 								&reason);
 		del_timer(&hcon->smp_timer);
+		if (hcon->disconn_cfm_cb)
+			hcon->disconn_cfm_cb(hcon, SMP_UNSPECIFIED);
 		clear_bit(HCI_CONN_ENCRYPT_PEND, &hcon->pend);
 		mgmt_auth_failed(hcon->hdev->id, conn->dst, reason);
 		hci_conn_put(hcon);