---

yaml
---
r: 203459
b: refs/heads/master
c: f7cabcd
h: refs/heads/master
i:
  203457: eb5a04c
  203455: 84cd84a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98e32a9ceea8e3a0cd6ea89c9ce8e09a74b03b78
+refs/heads/master: f7cabcdd51480282b58c09e5fe1c4835aaf98a66

trunk/drivers/net/cxgb4/cxgb4_main.c

@@ -3507,6 +3507,12 @@ static int __devinit init_one(struct pci_dev *pdev,
 		adapter->params.offload = 0;
 	}
 
+	/* See what interrupts we'll be using */
+	if (msi > 1 && enable_msix(adapter) == 0)
+		adapter->flags |= USING_MSIX;
+	else if (msi > 0 && pci_enable_msi(pdev) == 0)
+		adapter->flags |= USING_MSI;
+
 	/*
 	 * The card is now ready to go.  If any errors occur during device
 	 * registration we do not fail the whole card but rather proceed only
@@ -3542,12 +3548,6 @@ static int __devinit init_one(struct pci_dev *pdev,
 		setup_debugfs(adapter);
 	}
 
-	/* See what interrupts we'll be using */
-	if (msi > 1 && enable_msix(adapter) == 0)
-		adapter->flags |= USING_MSIX;
-	else if (msi > 0 && pci_enable_msi(pdev) == 0)
-		adapter->flags |= USING_MSI;
-
 	if (is_offload(adapter))
 		attach_ulds(adapter);
 
@@ -3571,6 +3571,7 @@ static int __devinit init_one(struct pci_dev *pdev,
 			free_netdev(adapter->port[i]);
 	if (adapter->flags & FW_OK)
 		t4_fw_bye(adapter, 0);
+	disable_msi(adapter);
  out_unmap_bar:
 	iounmap(adapter->regs);
  out_free_adapter: