From: Emmanuel Grumbach Date: Tue, 24 May 2011 07:44:47 +0000 (+0300) Subject: iwlagn: don't disable interrupts after the NIC has been reset X-Git-Tag: MMI-PSA29.97-13-9~18350^2~12^2~42^2~401^2~21 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7299751df36c02adafb5b897c56de71f0d7e2cb5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Wey-Yi Guy --- 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) struct iwl_priv *priv; struct ieee80211_hw *hw; struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data); - unsigned long flags; u16 pci_cmd, num_mac; u32 hw_rev; @@ -3646,10 +3645,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) /******************** * 7. Setup services ********************/ - spin_lock_irqsave(&priv->lock, flags); - iwl_disable_interrupts(priv); - spin_unlock_irqrestore(&priv->lock, flags); - pci_enable_msi(priv->pci_dev); iwl_alloc_isr_ict(priv);