Merge "msm: ipa3: Fix to not remove endpoint delay if stop channel fails" (0ca7a05c) · Commits · e / devices / android_kernel_fairphone_FP3

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

+4 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2018, 2020 The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -1231,7 +1231,8 @@ static int ipa3_stop_ul_chan_with_data_drain(u32 qmi_req_id,
		if (!stop_in_proc)
		goto exit;

		if (remove_delay && ep->ep_delay_set == true) {
		/* 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));
		ep_cfg_ctrl.ipa_ep_delay = false;
		result = ipa3_cfg_ep_ctrl(clnt_hdl,
		@@ -1312,7 +1313,7 @@ static int ipa3_stop_ul_chan_with_data_drain(u32 qmi_req_id,
		if (should_force_clear)
		ipa3_disable_force_clear(qmi_req_id);
		exit:
		if (remove_delay && ep->ep_delay_set == true) {
		if (remove_delay && ep->ep_delay_set == true && !stop_in_proc) {
		memset(&ep_cfg_ctrl, 0, sizeof(struct ipa_ep_cfg_ctrl));
		ep_cfg_ctrl.ipa_ep_delay = false;
		result = ipa3_cfg_ep_ctrl(clnt_hdl,