aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSathya Perla <sathya.perla@emulex.com>2012-09-28 04:39:42 +0000
committerDavid S. Miller <davem@davemloft.net>2012-09-30 02:15:34 -0400
commit55f5c3c55b5a682c4bb37628979c5909f9de7b30 (patch)
treee455c90edaa17e80477f73d65dfb4b383d1d636d /drivers
parentbe2net: remove type argument of be_cmd_mac_addr_query() (diff)
downloadlinux-dev-55f5c3c55b5a682c4bb37628979c5909f9de7b30.tar.xz
linux-dev-55f5c3c55b5a682c4bb37628979c5909f9de7b30.zip
be2net: fix wrong handling of be_setup() failure in be_probe()
Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index fa1743036a88..b712091bc218 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3889,7 +3889,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);
@@ -3910,8 +3910,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: