[PATCH 2/4][trusty] UBUNTU: SAUCE: iwlwifi: mvm: Free sram dump immediately after using it

Seth Forshee seth.forshee at canonical.com
Thu Mar 20 15:02:57 UTC 2014


After the sram dump is copied to the firmware error dump it is
no longer needed. Free it immediately instead of waiting for the
debugfs file to be read.

Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
---
 drivers/net/wireless/iwlwifi/mvm/debugfs.c | 3 ---
 drivers/net/wireless/iwlwifi/mvm/ops.c     | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
index 5afa741..865d9bd 100644
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
@@ -156,9 +156,6 @@ static int iwl_dbgfs_fw_error_dump_open(struct inode *inode, struct file *file)
 
 	file->private_data = mvm->fw_error_dump;
 	mvm->fw_error_dump = NULL;
-	kfree(mvm->fw_error_sram);
-	mvm->fw_error_sram = NULL;
-	mvm->fw_error_sram_len = 0;
 	ret = 0;
 
 out:
diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c
index 8d07464..a390eaf 100644
--- a/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@ -790,6 +790,9 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
 	 * mvm->fw_error_sram right now.
 	 */
 	memcpy(dump_data->data, mvm->fw_error_sram, mvm->fw_error_sram_len);
+	kfree(mvm->fw_error_sram);
+	mvm->fw_error_sram = NULL;
+	mvm->fw_error_sram_len = 0;
 }
 #endif
 
-- 
1.9.0





More information about the kernel-team mailing list