openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

be2net: Fix cleanup path in be_probe() 

Disabling msix was missing when probe fails after enabling msix.

Signed-off-by: Sathya Perla <sathyap@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sathya Perla 2009-11-22 22:02:26 +00:00 committed by David S. Miller
parent 2243e2e95e
commit 8d56ff1170
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/benet/be_main.c
View File

@ -1476,6 +1476,14 @@ static void be_worker(struct work_struct *work)
schedule_delayed_work(&adapter->work, msecs_to_jiffies(1000)); schedule_delayed_work(&adapter->work, msecs_to_jiffies(1000));
} }
static void be_msix_disable(struct be_adapter *adapter)
{
if (adapter->msix_enabled) {
pci_disable_msix(adapter->pdev);
adapter->msix_enabled = false;
}
}
static void be_msix_enable(struct be_adapter *adapter) static void be_msix_enable(struct be_adapter *adapter)
{ {
int i, status; int i, status;
@ -2096,6 +2104,7 @@ static int be_stats_init(struct be_adapter *adapter)
static void __devexit be_remove(struct pci_dev *pdev) static void __devexit be_remove(struct pci_dev *pdev)
{ {
struct be_adapter *adapter = pci_get_drvdata(pdev); struct be_adapter *adapter = pci_get_drvdata(pdev);
if (!adapter) if (!adapter)
return; return;
@ -2107,10 +2116,7 @@ static void __devexit be_remove(struct pci_dev *pdev)
be_ctrl_cleanup(adapter); be_ctrl_cleanup(adapter);
if (adapter->msix_enabled) { be_msix_disable(adapter);
pci_disable_msix(adapter->pdev);
adapter->msix_enabled = false;
}
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
pci_release_regions(pdev); pci_release_regions(pdev);
@ -2230,7 +2236,9 @@ static int __devinit be_probe(struct pci_dev *pdev,
ctrl_clean: ctrl_clean:
be_ctrl_cleanup(adapter); be_ctrl_cleanup(adapter);
free_netdev: free_netdev:
be_msix_disable(adapter);
free_netdev(adapter->netdev); free_netdev(adapter->netdev);
pci_set_drvdata(pdev, NULL);
rel_reg: rel_reg:
pci_release_regions(pdev); pci_release_regions(pdev);
disable_dev: disable_dev: