Commit 3ae1dc75 authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Marcel Holtmann
Browse files

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: default avatarSergey Shtylyov <s.shtylyov@omprussia.ru>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 2be43aba

net/bluetooth/hci_event.c

+6 −10
Original line number Diff line number Diff line
@@ -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);

}