diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-ucode.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c index 5187a2c20644..01a6d2fc795c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | |||
@@ -561,7 +561,7 @@ static int iwlcore_verify_inst_sparse(struct iwl_priv *priv, | |||
561 | * if IWL_DL_IO is set */ | 561 | * if IWL_DL_IO is set */ |
562 | iwl_write_direct32(priv, HBUS_TARG_MEM_RADDR, | 562 | iwl_write_direct32(priv, HBUS_TARG_MEM_RADDR, |
563 | i + IWLAGN_RTC_INST_LOWER_BOUND); | 563 | i + IWLAGN_RTC_INST_LOWER_BOUND); |
564 | val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT); | 564 | val = iwl_read32(priv, HBUS_TARG_MEM_RDAT); |
565 | if (val != le32_to_cpu(*image)) | 565 | if (val != le32_to_cpu(*image)) |
566 | return -EIO; | 566 | return -EIO; |
567 | } | 567 | } |
@@ -587,9 +587,7 @@ static void iwl_print_mismatch_inst(struct iwl_priv *priv, | |||
587 | offs < len && errors < 20; | 587 | offs < len && errors < 20; |
588 | offs += sizeof(u32), image++) { | 588 | offs += sizeof(u32), image++) { |
589 | /* read data comes through single port, auto-incr addr */ | 589 | /* read data comes through single port, auto-incr addr */ |
590 | /* NOTE: Use the debugless read so we don't flood kernel log | 590 | val = iwl_read32(priv, HBUS_TARG_MEM_RDAT); |
591 | * if IWL_DL_IO is set */ | ||
592 | val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT); | ||
593 | if (val != le32_to_cpu(*image)) { | 591 | if (val != le32_to_cpu(*image)) { |
594 | IWL_ERR(priv, "uCode INST section at " | 592 | IWL_ERR(priv, "uCode INST section at " |
595 | "offset 0x%x, is 0x%x, s/b 0x%x\n", | 593 | "offset 0x%x, is 0x%x, s/b 0x%x\n", |