]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
iwlwifi: dbg_ini: fix iwl_dump_ini_dev_mem_iter memory base address
authorShahar S Matityahu <shahar.s.matityahu@intel.com>
Sun, 17 Feb 2019 15:28:04 +0000 (17:28 +0200)
committerLuca Coelho <luciano.coelho@intel.com>
Wed, 3 Apr 2019 08:19:57 +0000 (11:19 +0300)
The driver is using range->start_addr before assigning it a value.
Set value into range->start_addr and then use it.

Signed-off-by: Shahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
drivers/net/wireless/intel/iwlwifi/fw/dbg.c

index caf860b7afffed76dd4e1e707c9d5530ae54a5a4..4beec863197e447d93beb184d021ecb761fd4d8b 100644 (file)
@@ -1090,10 +1090,10 @@ static int iwl_dump_ini_dev_mem_iter(struct iwl_fw_runtime *fwrt,
                                     void *range_ptr, int idx)
 {
        struct iwl_fw_ini_error_dump_range *range = range_ptr;
-       u32 addr = le32_to_cpu(range->start_addr);
-       u32 offset = le32_to_cpu(reg->offset);
+       u32 addr, offset = le32_to_cpu(reg->offset);
 
        range->start_addr = reg->start_addr[idx];
+       addr = le32_to_cpu(range->start_addr);
        range->range_data_size = reg->internal.range_data_size;
        iwl_trans_read_mem_bytes(fwrt->trans, addr + offset, range->data,
                                 le32_to_cpu(reg->internal.range_data_size));