diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 6669ab0d3f52..11660f67d6ab 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -5468,10 +5468,7 @@ static void __iwl3945_down(struct iwl_priv *priv) | |||
5468 | 5468 | ||
5469 | udelay(5); | 5469 | udelay(5); |
5470 | 5470 | ||
5471 | iwl3945_hw_nic_stop_master(priv); | 5471 | priv->cfg->ops->lib->apm_ops.reset(priv); |
5472 | iwl_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET); | ||
5473 | iwl3945_hw_nic_reset(priv); | ||
5474 | |||
5475 | exit: | 5472 | exit: |
5476 | memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp)); | 5473 | memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp)); |
5477 | 5474 | ||
@@ -7541,7 +7538,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e | |||
7541 | err = iwl_poll_direct_bit(priv, CSR_GP_CNTRL, | 7538 | err = iwl_poll_direct_bit(priv, CSR_GP_CNTRL, |
7542 | CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000); | 7539 | CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000); |
7543 | if (err < 0) { | 7540 | if (err < 0) { |
7544 | IWL_DEBUG_INFO("Failed to init the card\n"); | 7541 | IWL_DEBUG_INFO("Failed to init the APMG\n"); |
7545 | goto out_remove_sysfs; | 7542 | goto out_remove_sysfs; |
7546 | } | 7543 | } |
7547 | 7544 | ||