redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Bluetooth: consolidate error paths in hci_phy_link_complete_evt() 

hci_phy_link_complete_evt() has several duplicate error paths -- consolidate
them, using the *goto* statements.

Signed-off-by: Sergey Shtylyov <s.shtylyov@omprussia.ru>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
zero-sugar-mainline-defconfig
Sergey Shtylyov 2020-10-07 18:54:15 +03:00 committed by Marcel Holtmann
parent 2be43abac5
commit 3ae1dc756f
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/bluetooth/hci_event.c
View File

@ -4936,20 +4936,15 @@ static void hci_phy_link_complete_evt(struct hci_dev *hdev,
hci_dev_lock(hdev);
hcon = hci_conn_hash_lookup_handle(hdev, ev->phy_handle);
if (!hcon) {
hci_dev_unlock(hdev);
return;
}
if (!hcon)
goto unlock;
if (!hcon->amp_mgr) {
hci_dev_unlock(hdev);
return;
}
if (!hcon->amp_mgr)
goto unlock;
if (ev->status) {
hci_conn_del(hcon);
hci_dev_unlock(hdev);
return;
goto unlock;
}
bredr_hcon = hcon->amp_mgr->l2cap_conn->hcon;
@ -4966,6 +4961,7 @@ static void hci_phy_link_complete_evt(struct hci_dev *hdev,
amp_physical_cfm(bredr_hcon, hcon);
unlock:
hci_dev_unlock(hdev);
}