Merge "msm: mhi_dev: Checking the out channel status directly" (4e09fbde) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/platform/msm/mhi_dev/mhi_dev_net.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -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,7 +767,9 @@ int mhi_dev_net_interface_init(void)
		* with mhi_dev_net_open_chan_create_netif().
		*/
		ret_val = 0;
		if (out_channel_started) {
		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) {
		@@ -779,6 +778,7 @@ int mhi_dev_net_interface_init(void)
		goto channel_open_fail;
		}
		}
		}
		} else if (ret_val < 0) {
		goto register_state_cb_fail;
		}