diff options
| author | David Herrmann | 2013-02-24 19:36:51 +0100 |
|---|---|---|
| committer | Gustavo Padovan | 2013-03-08 14:38:44 +0100 |
| commit | 5e9d7f868f04106139a58212b860dcdc268ad3af (patch) | |
| tree | b18a22bb524431c882d39e425297fc0c9adf8b86 /net/bluetooth/l2cap_sock.c | |
| parent | Bluetooth: Make hidp_get_raw_report abort if the session is terminating (diff) | |
| download | kernel-qcow2-linux-5e9d7f868f04106139a58212b860dcdc268ad3af.tar.gz kernel-qcow2-linux-5e9d7f868f04106139a58212b860dcdc268ad3af.tar.xz kernel-qcow2-linux-5e9d7f868f04106139a58212b860dcdc268ad3af.zip | |
Bluetooth: discard bt_sock_unregister() errors
After we successfully registered a socket via bt_sock_register() there is
no reason to ever check the return code of bt_sock_unregister(). If
bt_sock_unregister() fails, it means the socket _is_ already unregistered
so we have what we want, don't we?
Also, to get bt_sock_unregister() to fail, another part of the kernel has
to unregister _our_ socket. This is sooo _wrong_ that it will break way
earlier than when we unregister our socket.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 1bcfb8422fdc..7f9704993b74 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -1312,8 +1312,6 @@ error: void l2cap_cleanup_sockets(void) { bt_procfs_cleanup(&init_net, "l2cap"); - if (bt_sock_unregister(BTPROTO_L2CAP) < 0) - BT_ERR("L2CAP socket unregistration failed"); - + bt_sock_unregister(BTPROTO_L2CAP); proto_unregister(&l2cap_proto); } |