commit 0deb435afc02f47ff6de3adfdf37ee7d39c698f8
author Linux Build Service Account <lnxbuild@localhost> Fri May 15 07:38:16 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri May 15 07:38:16 2015 -0700
tree e2b1e562c1a7b5d9b2ca0e64b6cc5a05e0e27ee1
parent 0da3f87790b5a3cf2491edb06514c4d36b41db2b
parent 7e85a75feb8e9d1c32d81c630bfd86d65a6a1d56

Merge "Bluetooth: Fix for BT crashes during preload timeout"

libbt-vendor/src/bt_vendor_qcom.c

diff --git a/libbt-vendor/src/bt_vendor_qcom.c b/libbt-vendor/src/bt_vendor_qcom.c
index 422da8a..86dd5ce 100644
--- a/libbt-vendor/src/bt_vendor_qcom.c
+++ b/libbt-vendor/src/bt_vendor_qcom.c
@@ -662,8 +662,19 @@
             {
                 // call hciattach to initalize the stack
                 if(bt_vendor_cbacks){
-                   ALOGI("Bluetooth Firmware and transport layer are initialized");
-                   bt_vendor_cbacks->fwcfg_cb(BT_VND_OP_RESULT_SUCCESS);
+                   if (btSocType ==  BT_SOC_ROME) {
+                       if (is_soc_initialized()) {
+                           ALOGI("Bluetooth FW and transport layer are initialized");
+                           bt_vendor_cbacks->fwcfg_cb(BT_VND_OP_RESULT_SUCCESS);
+                       } else {
+                           ALOGE("bt_vendor_cbacks is null or SoC not initialized");
+                           ALOGE("Error : hci, smd initialization Error");
+                           retval = -1;
+                       }
+                   } else {
+                       ALOGI("Bluetooth FW and transport layer are initialized");
+                       bt_vendor_cbacks->fwcfg_cb(BT_VND_OP_RESULT_SUCCESS);
+                   }
                 }
                 else{
                    ALOGE("bt_vendor_cbacks is null");