Merge 3b8457d528 on remote branch

Change-Id: I2fc29052582df98932b286598b4661931a9d7c94
This commit is contained in:
Linux Build Service Account 2024-07-21 14:12:19 -07:00
commit abeb53d57f

View File

@ -712,12 +712,13 @@ static int bt_configure_gpios(int on)
if (bt_sw_ctrl_gpio >= 0) {
power_src.platform_state[BT_SW_CTRL_GPIO] =
gpio_get_value(bt_sw_ctrl_gpio);
rc = msm_gpio_mpm_wake_set(pwr_data->sw_cntrl_gpio, 1);
if (rc < 0) {
pr_err("Failed to set msm_gpio_mpm_wake_set for sw_cntrl gpio, ret: %d\n",
if (pwr_data->sw_cntrl_gpio > 0) {
rc = msm_gpio_mpm_wake_set(pwr_data->sw_cntrl_gpio, 1);
if (rc < 0) {
pr_err("Failed to set msm_gpio_mpm_wake_set for sw_cntrl gpio, ret: %d\n",
rc);
return rc;
} else {
return rc;
}
pr_err("Set msm_gpio_mpm_wake_set for sw_cntrl gpio successful\n");
}
pr_err("BTON:Turn Bt OFF bt-sw-ctrl-gpio(%d) value(%d)\n",