The following commit has been merged in the batman-adv/next branch: commit 230fd16a2333fef9c012b054a127c7d157f7a7af Author: Andre Guedes andre.guedes@openbossa.org Date: Fri Jul 27 15:10:10 2012 -0300
Bluetooth: Trivial refactoring
This patch replaces the unlock-and-return statements by the goto statement.
Signed-off-by: Andre Guedes andre.guedes@openbossa.org Signed-off-by: Gustavo Padovan gustavo.padovan@collabora.co.uk
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 0386e1e..e89d7f2 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -3364,8 +3364,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) conn = hci_conn_add(hdev, LE_LINK, &ev->bdaddr); if (!conn) { BT_ERR("No memory for new connection"); - hci_dev_unlock(hdev); - return; + goto unlock; }
conn->dst_type = ev->bdaddr_type;