From: Johannes Berg Date: Wed, 31 May 2017 11:15:18 +0000 (+0200) Subject: iwlwifi: pcie: make ctxt-info free idempotent X-Git-Tag: v4.13-rc1~157^2~16^2^2~23 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=87fc030231b11a190f16d7162a141e2f162eae36;p=karo-tx-linux.git iwlwifi: pcie: make ctxt-info free idempotent By setting the pointers to NULL at the end, these functions are made idempotent. Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho --- diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c index b1f43397bb59..00d1a5f048b3 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c @@ -103,6 +103,7 @@ static void iwl_pcie_ctxt_info_free_fw_img(struct iwl_trans *trans) kfree(dram->fw); dram->fw_cnt = 0; + dram->fw = NULL; } void iwl_pcie_ctxt_info_free_paging(struct iwl_trans *trans) @@ -124,6 +125,7 @@ void iwl_pcie_ctxt_info_free_paging(struct iwl_trans *trans) kfree(dram->paging); dram->paging_cnt = 0; + dram->paging = NULL; } static int iwl_pcie_ctxt_info_init_fw_sec(struct iwl_trans *trans,