瀏覽代碼

sfc: Fix failure paths in efx_probe_port()

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ben Hutchings 14 年之前
父節點
當前提交
e42de26249
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/net/sfc/efx.c

+ 2 - 2
drivers/net/sfc/efx.c

@@ -761,7 +761,7 @@ static int efx_probe_port(struct efx_nic *efx)
 	/* Connect up MAC/PHY operations table */
 	/* Connect up MAC/PHY operations table */
 	rc = efx->type->probe_port(efx);
 	rc = efx->type->probe_port(efx);
 	if (rc)
 	if (rc)
-		goto err;
+		return rc;
 
 
 	/* Sanity check MAC address */
 	/* Sanity check MAC address */
 	if (is_valid_ether_addr(efx->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;
 	return 0;
 
 
  err:
  err:
-	efx_remove_port(efx);
+	efx->type->remove_port(efx);
 	return rc;
 	return rc;
 }
 }