---

yaml --- r: 321996 b: refs/heads/master c: d08fd0e h: refs/heads/master v: v3
git-mirror · Aug 6, 2012 · 91d3b3e · 91d3b3e
1 parent 2721751
commit 91d3b3e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3e7c0d90b14a3e7ac091d24cef09efb516d587b
+refs/heads/master: d08fd0e712a834d4abb869c0215a702e290bc51e
diff --git a/trunk/net/bluetooth/smp.c b/trunk/net/bluetooth/smp.c
@@ -579,8 +579,11 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb)
 
 	if (!test_and_set_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags))
 		smp = smp_chan_create(conn);
+	else
+		smp = conn->smp_chan;
 
-	smp = conn->smp_chan;
+	if (!smp)
+		return SMP_UNSPECIFIED;
 
 	smp->preq[0] = SMP_CMD_PAIRING_REQ;
 	memcpy(&smp->preq[1], req, sizeof(*req));