Merge tag 'iwlwifi-next-for-kalle-2016-09-15-2' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / net / wireless / intel / iwlwifi / mvm / fw-dbg.c

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
index 1abcabb..d89d0a1 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
@@ -440,14 +440,12 @@ static const struct iwl_prph_range iwl_prph_dump_addr_comm[] = {
        { .start = 0x00a04560, .end = 0x00a0457c },
        { .start = 0x00a04590, .end = 0x00a04598 },
        { .start = 0x00a045c0, .end = 0x00a045f4 },
-       { .start = 0x00a44000, .end = 0x00a7bf80 },
 };
 
 static const struct iwl_prph_range iwl_prph_dump_addr_9000[] = {
        { .start = 0x00a05c00, .end = 0x00a05c18 },
        { .start = 0x00a05400, .end = 0x00a056e8 },
        { .start = 0x00a08000, .end = 0x00a098bc },
-       { .start = 0x00adfc00, .end = 0x00adfd1c },
        { .start = 0x00a02400, .end = 0x00a02758 },
 };
 
@@ -559,7 +557,7 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
                                         sizeof(struct iwl_fw_error_dump_fifo);
                }
 
-               for (i = 0; i < ARRAY_SIZE(mem_cfg->txfifo_size); i++) {
+               for (i = 0; i < mem_cfg->num_txfifo_entries; i++) {
                        if (!mem_cfg->txfifo_size[i])
                                continue;
 
@@ -960,5 +958,6 @@ int iwl_mvm_start_fw_dbg_conf(struct iwl_mvm *mvm, u8 conf_id)
        }
 
        mvm->fw_dbg_conf = conf_id;
-       return ret;
+
+       return 0;
 }