From cc720f072997668b02522ff788aecf9582feda9e Mon Sep 17 00:00:00 2001 From: Yun Park Date: Tue, 3 Oct 2017 09:04:04 -0700 Subject: [PATCH] Revert "qcacld-3.0: Reset to NULL after freeing the memory" This reverts commit If6a1b2857d14f5fff2f47e541156ce2c27fb33a3 Fix build error caused by missing SMMU change propagation, where changed tx_comp_base to tx_comp_ring. Change-Id: Ie845b9da0fa6272dfe95abaaf587a583fb4710b3 CRs-Fixed: 2119811 --- core/dp/htt/htt_tx.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c index 47af19d95f50..afed558ecfbd 100644 --- a/core/dp/htt/htt_tx.c +++ b/core/dp/htt/htt_tx.c @@ -1383,7 +1383,6 @@ free_tx_comp_base: ipa_uc_tx_rsc. tx_comp_base), memctx)); - pdev->ipa_uc_tx_rsc.tx_comp_ring = NULL; free_tx_ce_idx: qdf_mem_free_consistent(pdev->osdev, pdev->osdev->dev, 4, @@ -1393,8 +1392,6 @@ free_tx_ce_idx: ipa_uc_tx_rsc. tx_ce_idx), memctx)); - pdev->ipa_uc_tx_rsc.tx_ce_idx = NULL; - return return_code; } @@ -1419,7 +1416,6 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev) (&pdev->ipa_uc_tx_rsc.tx_ce_idx), memctx)); } - pdev->ipa_uc_tx_rsc.tx_ce_idx = NULL; if (pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr) { qdf_mem_free_consistent( @@ -1432,7 +1428,6 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev) tx_comp_base), memctx)); } - pdev->ipa_uc_tx_rsc.tx_comp_ring = NULL; /* Free each single buffer */ htt_tx_buf_pool_free(pdev);