From 574c7030167729f502fbb6a155cfb08818d8fb9f Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Tue, 24 May 2011 10:44:47 +0300 Subject: [PATCH] --- yaml --- r: 255783 b: refs/heads/master c: 7299751df36c02adafb5b897c56de71f0d7e2cb5 h: refs/heads/master i: 255781: 8f031ebc0eb66a1487903477437d37f348b78eec 255779: 59c8455a776620404d505bc9eb26c6f601907f0b 255775: 3384c1e3903553a47efc6256027eef5f457d5530 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index af58c0cee852..45bb37a7c5b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecdbe86eda74005d1b4bc8387e1825ad95fab705 +refs/heads/master: 7299751df36c02adafb5b897c56de71f0d7e2cb5 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c index d66f1c29232e..0c747c3de6f2 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/trunk/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);