diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c index ee126f844a5c..becd92173ddd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | |||
@@ -595,7 +595,7 @@ static void iwl_dump_nic_error_log(struct iwl_trans *trans) | |||
595 | IWL_TRANS_GET_PCIE_TRANS(trans); | 595 | IWL_TRANS_GET_PCIE_TRANS(trans); |
596 | 596 | ||
597 | base = priv->device_pointers.error_event_table; | 597 | base = priv->device_pointers.error_event_table; |
598 | if (priv->ucode_type == IWL_UCODE_INIT) { | 598 | if (trans->shrd->ucode_type == IWL_UCODE_INIT) { |
599 | if (!base) | 599 | if (!base) |
600 | base = priv->init_errlog_ptr; | 600 | base = priv->init_errlog_ptr; |
601 | } else { | 601 | } else { |
@@ -607,7 +607,7 @@ static void iwl_dump_nic_error_log(struct iwl_trans *trans) | |||
607 | IWL_ERR(trans, | 607 | IWL_ERR(trans, |
608 | "Not valid error log pointer 0x%08X for %s uCode\n", | 608 | "Not valid error log pointer 0x%08X for %s uCode\n", |
609 | base, | 609 | base, |
610 | (priv->ucode_type == IWL_UCODE_INIT) | 610 | (trans->shrd->ucode_type == IWL_UCODE_INIT) |
611 | ? "Init" : "RT"); | 611 | ? "Init" : "RT"); |
612 | return; | 612 | return; |
613 | } | 613 | } |
@@ -710,7 +710,7 @@ static int iwl_print_event_log(struct iwl_trans *trans, u32 start_idx, | |||
710 | return pos; | 710 | return pos; |
711 | 711 | ||
712 | base = priv->device_pointers.log_event_table; | 712 | base = priv->device_pointers.log_event_table; |
713 | if (priv->ucode_type == IWL_UCODE_INIT) { | 713 | if (trans->shrd->ucode_type == IWL_UCODE_INIT) { |
714 | if (!base) | 714 | if (!base) |
715 | base = priv->init_evtlog_ptr; | 715 | base = priv->init_evtlog_ptr; |
716 | } else { | 716 | } else { |
@@ -824,7 +824,7 @@ int iwl_dump_nic_event_log(struct iwl_trans *trans, bool full_log, | |||
824 | struct iwl_priv *priv = priv(trans); | 824 | struct iwl_priv *priv = priv(trans); |
825 | 825 | ||
826 | base = priv->device_pointers.log_event_table; | 826 | base = priv->device_pointers.log_event_table; |
827 | if (priv->ucode_type == IWL_UCODE_INIT) { | 827 | if (trans->shrd->ucode_type == IWL_UCODE_INIT) { |
828 | logsize = priv->init_evtlog_size; | 828 | logsize = priv->init_evtlog_size; |
829 | if (!base) | 829 | if (!base) |
830 | base = priv->init_evtlog_ptr; | 830 | base = priv->init_evtlog_ptr; |
@@ -838,7 +838,7 @@ int iwl_dump_nic_event_log(struct iwl_trans *trans, bool full_log, | |||
838 | IWL_ERR(trans, | 838 | IWL_ERR(trans, |
839 | "Invalid event log pointer 0x%08X for %s uCode\n", | 839 | "Invalid event log pointer 0x%08X for %s uCode\n", |
840 | base, | 840 | base, |
841 | (priv->ucode_type == IWL_UCODE_INIT) | 841 | (trans->shrd->ucode_type == IWL_UCODE_INIT) |
842 | ? "Init" : "RT"); | 842 | ? "Init" : "RT"); |
843 | return -EINVAL; | 843 | return -EINVAL; |
844 | } | 844 | } |