aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2011-05-24 03:44:47 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-06-18 11:04:36 -0400
commit7299751df36c02adafb5b897c56de71f0d7e2cb5 (patch)
tree28a73041c580838014750632bc4c06eb42ea57c5 /drivers/net/wireless
parentecdbe86eda74005d1b4bc8387e1825ad95fab705 (diff)
iwlagn: don't disable interrupts after the NIC has been reset
It is superfluous to disable the interrupts after we reset the NIC. The only entity that could enable the interrupts after the NIC is reset is the driver. So remove this pointless action. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index d66f1c29232e..0c747c3de6f2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3485,7 +3485,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3485 struct iwl_priv *priv; 3485 struct iwl_priv *priv;
3486 struct ieee80211_hw *hw; 3486 struct ieee80211_hw *hw;
3487 struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data); 3487 struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
3488 unsigned long flags;
3489 u16 pci_cmd, num_mac; 3488 u16 pci_cmd, num_mac;
3490 u32 hw_rev; 3489 u32 hw_rev;
3491 3490
@@ -3646,10 +3645,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3646 /******************** 3645 /********************
3647 * 7. Setup services 3646 * 7. Setup services
3648 ********************/ 3647 ********************/
3649 spin_lock_irqsave(&priv->lock, flags);
3650 iwl_disable_interrupts(priv);
3651 spin_unlock_irqrestore(&priv->lock, flags);
3652
3653 pci_enable_msi(priv->pci_dev); 3648 pci_enable_msi(priv->pci_dev);
3654 3649
3655 iwl_alloc_isr_ict(priv); 3650 iwl_alloc_isr_ict(priv);