Commit 45deacc7 authored by David S. Miller's avatar David S. Miller

Merge tag 'for-net-2021-06-14' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

Luiz Augusto von Dentz says:

====================
bluetooth pull request for net:

 - Fix crash on SMP when debug is enabled
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ad9d24c9 995fca15
...@@ -3229,7 +3229,7 @@ static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan) ...@@ -3229,7 +3229,7 @@ static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan)
{ {
struct l2cap_chan *chan; struct l2cap_chan *chan;
bt_dev_dbg(pchan->conn->hcon->hdev, "pchan %p", pchan); BT_DBG("pchan %p", pchan);
chan = l2cap_chan_create(); chan = l2cap_chan_create();
if (!chan) if (!chan)
...@@ -3250,7 +3250,7 @@ static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan) ...@@ -3250,7 +3250,7 @@ static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan)
*/ */
atomic_set(&chan->nesting, L2CAP_NESTING_SMP); atomic_set(&chan->nesting, L2CAP_NESTING_SMP);
bt_dev_dbg(pchan->conn->hcon->hdev, "created chan %p", chan); BT_DBG("created chan %p", chan);
return chan; return chan;
} }
...@@ -3354,7 +3354,7 @@ static void smp_del_chan(struct l2cap_chan *chan) ...@@ -3354,7 +3354,7 @@ static void smp_del_chan(struct l2cap_chan *chan)
{ {
struct smp_dev *smp; struct smp_dev *smp;
bt_dev_dbg(chan->conn->hcon->hdev, "chan %p", chan); BT_DBG("chan %p", chan);
smp = chan->data; smp = chan->data;
if (smp) { if (smp) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment