From 96f282be7e06aad94f494afe11a60642e44c6c9d Mon Sep 17 00:00:00 2001
From: Brian Gix <bgix@codeaurora.org>
Date: Wed, 23 Nov 2011 08:28:35 -0800
Subject: [PATCH] --- yaml --- r: 278591 b: refs/heads/master c:
 c8eb969071032defb1dc493ae28cf2e2a31193a5 h: refs/heads/master i:   278589:
 01c59d02666a8f1086465e329a536b4150d3e470   278587:
 afbcfd1828a5ccb51a4fc0225509cda3765c50c0   278583:
 c99218009fb8b6f3709c188f413a51f44cc8e489   278575:
 2857712be1783ac87ad41f0a694270174398610f   278559:
 c448a658ed5e0b8c29492f189a8dd86d5deb984a   278527:
 60182f3596b168f0a8302e7ae396a910783dc901 v: v3

---
 [refs]                    |  2 +-
 trunk/net/bluetooth/smp.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dd41a3ceb746..d5cc12ba5a7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1143d45846f190465382dd667c7f893b9d1fd131
+refs/heads/master: c8eb969071032defb1dc493ae28cf2e2a31193a5
diff --git a/trunk/net/bluetooth/smp.c b/trunk/net/bluetooth/smp.c
index 94e94ca35384..b9af4885ae53 100644
--- a/trunk/net/bluetooth/smp.c
+++ b/trunk/net/bluetooth/smp.c
@@ -379,7 +379,15 @@ static struct smp_chan *smp_chan_create(struct l2cap_conn *conn)
 
 void smp_chan_destroy(struct l2cap_conn *conn)
 {
-	kfree(conn->smp_chan);
+	struct smp_chan *smp = conn->smp_chan;
+
+	clear_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->pend);
+
+	if (smp->tfm)
+		crypto_free_blkcipher(smp->tfm);
+
+	kfree(smp);
+	conn->smp_chan = NULL;
 	hci_conn_put(conn->hcon);
 }