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:
Родитель
d117773ce5
Коммит
b699ec0d99
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче