Merge branch 'q' into auto-kernel

* q: Revert "msm: ipa3: fix the unmap logic"
UtsavBalar1231 · Aug 28, 2020 · 1f42d8b · 1f42d8b
2 parents c12b7ee + 911ca2e
commit 1f42d8b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_uc_ntn.c b/drivers/platform/msm/ipa/ipa_v3/ipa_uc_ntn.c
@@ -606,7 +606,7 @@ int ipa3_tear_down_uc_offload_pipes(int ipa_ep_idx_ul,
 	}
 
 	/* unmap the DL pipe */
-	result = ipa3_smmu_map_uc_ntn_pipes(&params->dl, false, false);
+	result = ipa3_smmu_map_uc_ntn_pipes(&params->dl, false, true);
 	if (result) {
 		IPAERR("failed to unmap SMMU for DL %d\n", result);
 		goto fail;
@@ -627,7 +627,7 @@ int ipa3_tear_down_uc_offload_pipes(int ipa_ep_idx_ul,
 	}
 
 	/* unmap the UL pipe */
-	result = ipa3_smmu_map_uc_ntn_pipes(&params->ul, false, true);
+	result = ipa3_smmu_map_uc_ntn_pipes(&params->ul, false, false);
 	if (result) {
 		IPAERR("failed to unmap SMMU for UL %d\n", result);
 		goto fail;