Patchwork [net-next-2.6,04/10] sfc: Fix failure paths in efx_probe_port()

login
register
mail settings
Submitter Ben Hutchings
Date Sept. 10, 2010, 4:41 p.m.
Message ID <1284136879.2267.98.camel@achroite.uk.solarflarecom.com>
Download mbox | patch
Permalink /patch/64419/
State Accepted
Delegated to: David Miller
Headers show

Comments

Ben Hutchings - Sept. 10, 2010, 4:41 p.m.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---
 drivers/net/sfc/efx.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index b385f89..a576045 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -761,7 +761,7 @@  static int efx_probe_port(struct efx_nic *efx)
 	/* Connect up MAC/PHY operations table */
 	rc = efx->type->probe_port(efx);
 	if (rc)
-		goto err;
+		return rc;
 
 	/* Sanity check MAC address */
 	if (is_valid_ether_addr(efx->mac_address)) {
@@ -782,7 +782,7 @@  static int efx_probe_port(struct efx_nic *efx)
 	return 0;
 
  err:
-	efx_remove_port(efx);
+	efx->type->remove_port(efx);
 	return rc;
 }