---

yaml --- r: 255783 b: refs/heads/master c: 7299751 h: refs/heads/master i: 255781: 8f031eb 255779: 59c8455 255775: 3384c1e v: v3
git-mirror · Jun 18, 2011 · 574c703 · 574c703
1 parent df85eea
commit 574c703
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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);