btbcm: fix btbcm driver for Lockdown
Lockdown doesn't yet have/need a Bluetooth firmware patch file:
/lib/firmware/brcm/BCM20702B0-0a5c-22be.hcd
Regardless, btbcm_set_bdaddr_base() needs to be called, so that
BD_ADDR of the Broadcom Bluetooth controller is set correctly.
After the fix:
GTCFSJ1548E0109# hnvram -r MAC_ADDR_BT
MAC_ADDR_BT=f4:f5:e8:01:91:8d
GTCFSJ1548E0109# hciconfig -a
hci0: Type: BR/EDR Bus: USB
BD Address: F4:F5:E8:01:91:8D
Change-Id: I2f372fbb747058f96c447b11f19baa0e66004874
diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index 9039b47..cfb854a 100644
--- a/drivers/bluetooth/btbcm.c
+++ b/drivers/bluetooth/btbcm.c
@@ -397,7 +397,7 @@
err = btbcm_patchram(hdev, fw_name);
if (err == -ENOENT)
- return 0;
+ goto set_bdaddr;
/* Reset */
err = btbcm_reset(hdev);
@@ -418,6 +418,7 @@
hw_name ? : "BCM", (subver & 0x7000) >> 13,
(subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);
+set_bdaddr:
btbcm_set_bdaddr_base(hdev);
btbcm_check_bdaddr(hdev);
