diff options
| author | Sudhir Sharma <sudhshar@codeaurora.org> | 2014-08-11 11:58:48 -0700 |
|---|---|---|
| committer | Sudhir Sharma <sudhshar@codeaurora.org> | 2014-08-11 13:39:31 -0700 |
| commit | 2f33cc1c1b2880f95d2c1724beefee4014284426 (patch) | |
| tree | 0ab49af26349d23bb7e6dcf5f47b4f12090d3e2e | |
| parent | a1d91d1b9ab51a0e8874b82a157497d301070047 (diff) | |
| parent | 6f20221607cfb847fff3d622b4fa30bdeb8535b9 (diff) | |
| download | android_hardware_qcom_bt-2f33cc1c1b2880f95d2c1724beefee4014284426.tar.gz android_hardware_qcom_bt-2f33cc1c1b2880f95d2c1724beefee4014284426.tar.bz2 android_hardware_qcom_bt-2f33cc1c1b2880f95d2c1724beefee4014284426.zip | |
Merge tag 'AU_LINUX_ANDROID_KK.04.04.04.010.094' into HEAD
AU_LINUX_ANDROID_KK.04.04.04.010.094 based on quic/aosp/kk
Change-Id: I8801d95572d6ab9240e7285e85821912d882e1db
| -rw-r--r-- | libbt-vendor/src/bt_vendor_qcom.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/libbt-vendor/src/bt_vendor_qcom.c b/libbt-vendor/src/bt_vendor_qcom.c index b3602e6..1c3f40a 100644 --- a/libbt-vendor/src/bt_vendor_qcom.c +++ b/libbt-vendor/src/bt_vendor_qcom.c @@ -381,7 +381,12 @@ static int bt_powerup(int en ) goto done; } #endif - asprintf(&enable_ldo_path, "/sys/class/rfkill/rfkill%d/device/extldo", rfkill_id); + ret = asprintf(&enable_ldo_path, "/sys/class/rfkill/rfkill%d/device/extldo", rfkill_id); + if( (ret < 0 ) || (enable_ldo_path == NULL) ) + { + ALOGE("Memory Allocation failure"); + return -1; + } if ((fd_ldo = open(enable_ldo_path, O_RDWR)) < 0) { ALOGE("open(%s) failed: %s (%d)", enable_ldo_path, strerror(errno), errno); return -1; @@ -631,7 +636,8 @@ static int op(bt_vendor_opcode_t opcode, void *param) case BT_VND_OP_SCO_CFG: { - bt_vendor_cbacks->scocfg_cb(BT_VND_OP_RESULT_SUCCESS); //dummy + if (bt_vendor_cbacks) + bt_vendor_cbacks->scocfg_cb(BT_VND_OP_RESULT_SUCCESS); //dummy } break; #ifdef BT_SOC_TYPE_ROME @@ -809,11 +815,12 @@ static int op(bt_vendor_opcode_t opcode, void *param) else { lpm_set_ar3k(UPIO_LPM_MODE, UPIO_DEASSERT, 0); } - - bt_vendor_cbacks->lpm_cb(BT_VND_OP_RESULT_SUCCESS); + if (bt_vendor_cbacks ) + bt_vendor_cbacks->lpm_cb(BT_VND_OP_RESULT_SUCCESS); } else { - bt_vendor_cbacks->lpm_cb(BT_VND_OP_RESULT_SUCCESS); //dummy + if (bt_vendor_cbacks) + bt_vendor_cbacks->lpm_cb(BT_VND_OP_RESULT_SUCCESS); //dummy } break; |