diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2017-11-08 08:03:04 +0100 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2017-12-13 00:28:40 +0100 |
commit | 1b259904a2d0ad8c57feb498932bed5171112af3 (patch) | |
tree | 167d165d69f2cd462ecf1b1ca07ad465a403b157 /net/bluetooth/af_bluetooth.c | |
parent | Bluetooth: hci_qca: Avoid setup failure on missing rampatch (diff) | |
download | linux-1b259904a2d0ad8c57feb498932bed5171112af3.tar.xz linux-1b259904a2d0ad8c57feb498932bed5171112af3.zip |
Bluetooth: Use common error handling code in bt_init()
* Improve jump targets so that a bit of exception handling can be better
reused at the end of this function.
* Adjust five condition checks.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/af_bluetooth.c')
-rw-r--r-- | net/bluetooth/af_bluetooth.c | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 91e3ba280706..f044202346c6 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -766,43 +766,39 @@ static int __init bt_init(void) return err; err = sock_register(&bt_sock_family_ops); - if (err < 0) { - bt_sysfs_cleanup(); - return err; - } + if (err) + goto cleanup_sysfs; BT_INFO("HCI device and connection manager initialized"); err = hci_sock_init(); - if (err < 0) - goto error; + if (err) + goto unregister_socket; err = l2cap_init(); - if (err < 0) - goto sock_err; + if (err) + goto cleanup_socket; err = sco_init(); - if (err < 0) { - l2cap_exit(); - goto sock_err; - } + if (err) + goto cleanup_cap; err = mgmt_init(); - if (err < 0) { - sco_exit(); - l2cap_exit(); - goto sock_err; - } + if (err) + goto cleanup_sco; return 0; -sock_err: +cleanup_sco: + sco_exit(); +cleanup_cap: + l2cap_exit(); +cleanup_socket: hci_sock_cleanup(); - -error: +unregister_socket: sock_unregister(PF_BLUETOOTH); +cleanup_sysfs: bt_sysfs_cleanup(); - return err; } |