commit b4e366d0ef7f4623be7aa845b6c014af3d03a60e
author Petri Gynther <pgynther@google.com> Wed Mar 30 21:21:05 2016 -0700
committer Petri Gynther <pgynther@google.com> Wed Mar 30 21:37:22 2016 -0700
tree a7628459693a32e5d6e87bd44d2cdc6d5c54513c
parent 064242017a0e27439a117a2fc3f3aa16a25d792c

btbcm: minor cleanup

Unify backports btbcm.c with kernel/bruno btbcm.c.
The same change is also present in upstream bluetooth-next tree.

Change-Id: Ia2e134c28664792e1ce21f0b6178db8c737842b2

drivers/bluetooth/btbcm.c

diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index 905359c..0bdd0d2 100644
--- a/drivers/bluetooth/btbcm.c
+++ b/drivers/bluetooth/btbcm.c
@@ -526,10 +526,8 @@
 
 	err = request_firmware(&fw, fw_name, &hdev->dev);
 	if (err < 0) {
-		if (err == -ENOENT)
-			goto set_bdaddr;
 		BT_INFO("%s: BCM: Patch %s not found", hdev->name, fw_name);
-		return 0;
+		goto done;
 	}
 
 	btbcm_patchram(hdev, fw);
@@ -563,9 +561,8 @@
 	BT_INFO("%s: %s", hdev->name, (char *)(skb->data + 1));
 	kfree_skb(skb);
 
-set_bdaddr:
+done:
 	btbcm_set_bdaddr_base(hdev);
-
 	btbcm_check_bdaddr(hdev);
 
 	set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);