diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rx.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c index db6c90f6affe..e321a294abde 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c | |||
@@ -604,16 +604,16 @@ static int iwlagn_rx_card_state_notif(struct iwl_priv *priv, | |||
604 | if (flags & (SW_CARD_DISABLED | HW_CARD_DISABLED | | 604 | if (flags & (SW_CARD_DISABLED | HW_CARD_DISABLED | |
605 | CT_CARD_DISABLED)) { | 605 | CT_CARD_DISABLED)) { |
606 | 606 | ||
607 | iwl_write32(trans(priv), CSR_UCODE_DRV_GP1_SET, | 607 | iwl_write32(priv->trans, CSR_UCODE_DRV_GP1_SET, |
608 | CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED); | 608 | CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED); |
609 | 609 | ||
610 | iwl_write_direct32(trans(priv), HBUS_TARG_MBX_C, | 610 | iwl_write_direct32(priv->trans, HBUS_TARG_MBX_C, |
611 | HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED); | 611 | HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED); |
612 | 612 | ||
613 | if (!(flags & RXON_CARD_DISABLED)) { | 613 | if (!(flags & RXON_CARD_DISABLED)) { |
614 | iwl_write32(trans(priv), CSR_UCODE_DRV_GP1_CLR, | 614 | iwl_write32(priv->trans, CSR_UCODE_DRV_GP1_CLR, |
615 | CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED); | 615 | CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED); |
616 | iwl_write_direct32(trans(priv), HBUS_TARG_MBX_C, | 616 | iwl_write_direct32(priv->trans, HBUS_TARG_MBX_C, |
617 | HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED); | 617 | HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED); |
618 | } | 618 | } |
619 | if (flags & CT_CARD_DISABLED) | 619 | if (flags & CT_CARD_DISABLED) |
@@ -636,7 +636,7 @@ static int iwlagn_rx_card_state_notif(struct iwl_priv *priv, | |||
636 | wiphy_rfkill_set_hw_state(priv->hw->wiphy, | 636 | wiphy_rfkill_set_hw_state(priv->hw->wiphy, |
637 | test_bit(STATUS_RF_KILL_HW, &priv->status)); | 637 | test_bit(STATUS_RF_KILL_HW, &priv->status)); |
638 | else | 638 | else |
639 | wake_up(&trans(priv)->wait_command_queue); | 639 | wake_up(&priv->trans->wait_command_queue); |
640 | return 0; | 640 | return 0; |
641 | } | 641 | } |
642 | 642 | ||