OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: Call ops->teardown() without checking for NULL 

Users that don't implement teardown() should use l2cap_chan_no_teardown()

Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
This commit is contained in:
Gustavo Padovan 2012-10-06 11:51:54 +01:00
parent d117773ce5
commit b699ec0d99
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/bluetooth/l2cap_core.c
View File

@ -542,8 +542,7 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err)
hci_conn_put(conn->hcon);
}
if (chan->ops->teardown)
chan->ops->teardown(chan, err);
chan->ops->teardown(chan, err);
if (test_bit(CONF_NOT_COMPLETE, &chan->conf_state))
return;
@ -582,8 +581,7 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason)
switch (chan->state) {
case BT_LISTEN:
if (chan->ops->teardown)
chan->ops->teardown(chan, 0);
chan->ops->teardown(chan, 0);
break;
case BT_CONNECTED:
@ -625,8 +623,7 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason)
break;
default:
if (chan->ops->teardown)
chan->ops->teardown(chan, 0);
chan->ops->teardown(chan, 0);
break;
}
}