A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-07 12:25:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: mhi_dev: Checking the out channel status directly"

Browse source
This commit is contained in:
qctecmdr 2021-12-06 21:22:42 -08:00 • committed by Gerrit - the friendly Code Review server
commit 4e09fbde44
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
drivers/platform/msm/mhi_dev/mhi_dev_net.c
View file

@ -695,7 +695,7 @@ static void mhi_dev_net_state_cb(struct mhi_dev_client_cb_data *cb_data)
int mhi_dev_net_interface_init(void)
{
int ret_val = 0, index = 0;
bool out_channel_started = false;
uint32_t info_out_ch = 0;
struct mhi_dev_net_client *mhi_net_client = NULL;
if (mhi_net_ctxt.client_handle) {
@ -750,10 +750,7 @@ int mhi_dev_net_interface_init(void)
}
ret_val = mhi_register_state_cb(mhi_dev_net_state_cb,
mhi_net_client, MHI_CLIENT_IP_SW_4_OUT);
/* -EEXIST indicates success and channel is already open */
if (ret_val == -EEXIST)
out_channel_started = true;
else if (ret_val < 0)
if (ret_val < 0 && ret_val != -EEXIST)
goto register_state_cb_fail;
ret_val = mhi_register_state_cb(mhi_dev_net_state_cb,
@ -770,13 +767,16 @@ int mhi_dev_net_interface_init(void)
* with mhi_dev_net_open_chan_create_netif().
*/
ret_val = 0;
if (out_channel_started) {
ret_val = mhi_dev_net_open_chan_create_netif
(mhi_net_client);
if (ret_val < 0) {
mhi_dev_net_log(MHI_ERROR,
"Failed to open channels\n");
goto channel_open_fail;
if (!mhi_ctrl_state_info(mhi_net_client->out_chan,
&info_out_ch)) {
if (info_out_ch == MHI_STATE_CONNECTED) {
ret_val = mhi_dev_net_open_chan_create_netif
(mhi_net_client);
if (ret_val < 0) {
mhi_dev_net_log(MHI_ERROR,
"Failed to open channels\n");
goto channel_open_fail;
}
}
}
} else if (ret_val < 0) {