[Quantal][PATCH 26/29] be2net: fix wrong handling of be_setup() failure in be_probe()
Jesse Sung
jesse.sung at canonical.com
Thu Dec 13 06:49:59 UTC 2012
From: Sathya Perla <sathya.perla at emulex.com>
BugLink: https://launchpad.net/bugs/1083088
Signed-off-by: Sathya Perla <sathya.perla at emulex.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
(cherry picked from commit 55f5c3c55b5a682c4bb37628979c5909f9de7b30)
Signed-off-by: Wen-chien Jesse Sung <jesse.sung at canonical.com>
---
drivers/net/ethernet/emulex/benet/be_main.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 6c2ff94..f34282e 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3885,7 +3885,7 @@ static int __devinit be_probe(struct pci_dev *pdev,
status = be_setup(adapter);
if (status)
- goto msix_disable;
+ goto stats_clean;
be_netdev_init(netdev);
status = register_netdev(netdev);
@@ -3903,8 +3903,6 @@ static int __devinit be_probe(struct pci_dev *pdev,
unsetup:
be_clear(adapter);
-msix_disable:
- be_msix_disable(adapter);
stats_clean:
be_stats_cleanup(adapter);
ctrl_clean:
--
1.7.10.4
More information about the kernel-team
mailing list