summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChiou-Hao Hsu <chsu@codeaurora.org>2015-08-03 12:53:39 -0700
committerChiou-Hao Hsu <chsu@codeaurora.org>2015-08-03 12:53:39 -0700
commit2cd4ae1978f765d0a35904c6cfe0f818f7c56383 (patch)
tree82f15731bce6ff001ea770c55fde6d0ae7fcf94b
parent4b44baa5d02cee5c29ae32cd8fb465099f39f722 (diff)
parent39d1e579b147c705e2842d951ae6edca2c0c2ee0 (diff)
downloadandroid_hardware_qcom_bt-2cd4ae1978f765d0a35904c6cfe0f818f7c56383.tar.gz
android_hardware_qcom_bt-2cd4ae1978f765d0a35904c6cfe0f818f7c56383.tar.bz2
android_hardware_qcom_bt-2cd4ae1978f765d0a35904c6cfe0f818f7c56383.zip
Merge tag 'AU_LINUX_ANDROID_LA.HB.1.1.1.05.01.01.063.356' into HEAD
* commit '39d1e579b147c705e2842d951ae6edca2c0c2ee0': Bluetooth: Removing userial cleaup from SSR cleanup Change-Id: Ibcf051509488511145747eff341a161e2d3b9d9b
-rw-r--r--libbt-vendor/src/bt_vendor_qcom.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libbt-vendor/src/bt_vendor_qcom.c b/libbt-vendor/src/bt_vendor_qcom.c
index e853f77..838efc0 100644
--- a/libbt-vendor/src/bt_vendor_qcom.c
+++ b/libbt-vendor/src/bt_vendor_qcom.c
@@ -1075,12 +1075,11 @@ static void ssr_cleanup(void) {
op(BT_VND_OP_POWER_CTRL, &pwr_state);
#endif
- } else {
- //pronto case
- op(BT_VND_OP_USERIAL_CLOSE, NULL);
}
+#ifdef BT_SOC_TYPE_ROME
/*Generally switching of chip should be enough*/
op(BT_VND_OP_POWER_CTRL, &pwr_state);
+#endif
}