From b6a394c53096f3ea20109850b317c0c7f5fefb6a Mon Sep 17 00:00:00 2001 From: Dimitris Michailidis Date: Sun, 11 Jul 2010 12:01:15 +0000 Subject: [PATCH] --- yaml --- r: 203459 b: refs/heads/master c: f7cabcdd51480282b58c09e5fe1c4835aaf98a66 h: refs/heads/master i: 203457: eb5a04cbabeae5f24a348a22d19fc474d98802b3 203455: 84cd84a38cb7961d7778694bec97c6bb3e75dfbd v: v3 --- [refs] | 2 +- trunk/drivers/net/cxgb4/cxgb4_main.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2f27097e6016..5d1d41ef1536 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98e32a9ceea8e3a0cd6ea89c9ce8e09a74b03b78 +refs/heads/master: f7cabcdd51480282b58c09e5fe1c4835aaf98a66 diff --git a/trunk/drivers/net/cxgb4/cxgb4_main.c b/trunk/drivers/net/cxgb4/cxgb4_main.c index 26199979290d..743dc6faec56 100644 --- a/trunk/drivers/net/cxgb4/cxgb4_main.c +++ b/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: