AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Bluetooth: Use common error handling code in bt_init()

Browse Source 
* 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>
This commit is contained in:
Markus Elfring 2017-11-08 08:03:04 +01:00 committed by Marcel Holtmann
parent ba8f359790
commit 1b259904a2
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
net/bluetooth/af_bluetooth.c
View File

@ -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;
}