Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0caad3ca authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa3: Fix to not remove endpoint delay if stop channel fails"

parents f495e825 93229ec2

drivers/platform/msm/ipa/ipa_v3/ipa_client.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1056,7 +1056,8 @@ static int ipa3_stop_ul_chan_with_data_drain(u32 qmi_req_id, 
	if (!stop_in_proc)

	if (!stop_in_proc)

		goto exit;

		goto exit;





	if (remove_delay && ep->ep_delay_set) {

	/* Remove delay only if stop channel success*/

	if (remove_delay && ep->ep_delay_set == true && !stop_in_proc) {

		memset(&ep_cfg_ctrl, 0, sizeof(struct ipa_ep_cfg_ctrl));

		memset(&ep_cfg_ctrl, 0, sizeof(struct ipa_ep_cfg_ctrl));

		ep_cfg_ctrl.ipa_ep_delay = false;

		ep_cfg_ctrl.ipa_ep_delay = false;

		result = ipa3_cfg_ep_ctrl(clnt_hdl,

		result = ipa3_cfg_ep_ctrl(clnt_hdl,
@@ -1137,7 +1138,7 @@ static int ipa3_stop_ul_chan_with_data_drain(u32 qmi_req_id, 
	if (should_force_clear)

	if (should_force_clear)

		ipa3_disable_force_clear(qmi_req_id);

		ipa3_disable_force_clear(qmi_req_id);

exit:

exit:

	if (remove_delay && ep->ep_delay_set) {

	if (remove_delay && ep->ep_delay_set == true && !stop_in_proc) {

		memset(&ep_cfg_ctrl, 0, sizeof(struct ipa_ep_cfg_ctrl));

		memset(&ep_cfg_ctrl, 0, sizeof(struct ipa_ep_cfg_ctrl));

		ep_cfg_ctrl.ipa_ep_delay = false;

		ep_cfg_ctrl.ipa_ep_delay = false;

		result = ipa3_cfg_ep_ctrl(clnt_hdl,

		result = ipa3_cfg_ep_ctrl(clnt_hdl,