From ea5b9568c2f4ca3869b27ceea86c739ef37187fe Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 5 Mar 2012 11:24:34 -0800
Subject: [PATCH] --- yaml --- r: 291182 b: refs/heads/master c:
 ce9e80af4f2c5dffb0df470538573d473c91d540 h: refs/heads/master v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-pci.c | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 72efa44302fe..8655e6302b87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 706c4ff67cb86134a3a93413a595a7c5559b7cc2
+refs/heads/master: ce9e80af4f2c5dffb0df470538573d473c91d540
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c b/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c
index d109b0f32e33..c5e339ee918b 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -278,17 +278,9 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 #ifdef CONFIG_IWLWIFI_IDI
 	iwl_trans = iwl_trans_idi_alloc(shrd, pdev, ent);
-	if (iwl_trans == NULL) {
-		err = -ENOMEM;
-		goto out_free_bus;
-	}
-
-	shrd->trans = iwl_trans;
-	pci_set_drvdata(pdev, iwl_trans);
-
-	err = iwl_drv_start(shrd, iwl_trans, cfg);
 #else
 	iwl_trans = iwl_trans_pcie_alloc(shrd, pdev, ent);
+#endif
 	if (iwl_trans == NULL) {
 		err = -ENOMEM;
 		goto out_free_bus;
@@ -298,7 +290,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	pci_set_drvdata(pdev, iwl_trans);
 
 	err = iwl_drv_start(shrd, iwl_trans, cfg);
-#endif
 	if (err)
 		goto out_free_trans;